From patchwork Tue May 6 15:34:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 42347 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2DC9127BC4B; Tue, 6 May 2025 16:36:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BE5AF27BC49 for ; Tue, 6 May 2025 16:36:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCKL0-0007I0-VB; Tue, 06 May 2025 11:36:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCKKx-00076g-KO for guix-patches@gnu.org; Tue, 06 May 2025 11:36:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCKKx-00037Q-A4 for guix-patches@gnu.org; Tue, 06 May 2025 11:36:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=iFYr91OwhCOxBAXZ9RAJciS7sp4dMZW2o+sbdraD8dM=; b=UpHD+BGglGbk/Jo7jnRVu3xxLRYSs8wJUZgAKNiianX4xT1bKmY23uD8HD6GjZiij/ZF5w7bw8eJSDYmarQaCxpFBVvEjv5kpGgwPKkoYfiF3Bm9G8UiQFljtiXCwLsQR074tdvZFug5g8aZd9rqLsXXMBQuCaPuA7p3ezXCAPVA5POOcLyX6NakOfF7eiBjclSQRZ+SoMyt/n10yxQfhJNqVccky/Kra/IwwL5TInYFWo3xDiUeLhiDF+EvDD5R2ZHwDGo0G5/VxNGoF2uHQArz8ERZpByiGxw/7wBrBcp1bFn7c6UccmJbZFkw0L/DWvCArmNVIVTCxRtFmTNNSQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCKKw-0007OS-Ae for guix-patches@gnu.org; Tue, 06 May 2025 11:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69472] [PATCH] gnu: avro-cpp: Update to 1.12.0. References: <6d242f721778b3d94d0f10564bd479131fa8325e.camel@science.leidenuniv.nl> In-Reply-To: <6d242f721778b3d94d0f10564bd479131fa8325e.camel@science.leidenuniv.nl> Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 May 2025 15:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69472 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69472@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 69472-submit@debbugs.gnu.org id=B69472.174654571628292 (code B ref 69472); Tue, 06 May 2025 15:36:02 +0000 Received: (at 69472) by debbugs.gnu.org; 6 May 2025 15:35:16 +0000 Received: from localhost ([127.0.0.1]:59760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCKKC-0007ME-0c for submit@debbugs.gnu.org; Tue, 06 May 2025 11:35:16 -0400 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]:56548) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uCKK9-0007Jf-Na for 69472@debbugs.gnu.org; Tue, 06 May 2025 11:35:14 -0400 Received: by mail-qt1-x82d.google.com with SMTP id d75a77b69052e-476ac73c76fso65506731cf.0 for <69472@debbugs.gnu.org>; Tue, 06 May 2025 08:35:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1746545707; x=1747150507; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iFYr91OwhCOxBAXZ9RAJciS7sp4dMZW2o+sbdraD8dM=; b=rJRgrcaajvVHEjbjCgvF0prhrREUJwM/Y4Fv791GO9spdiOWgc+uk731VuKv2limqL 5j7qZbSXL/4ujTD/GK+kBihU1R4kgm+AReo+1SxvJnu98A0mLvtBWhf1ckVzw+IAfYPR gCPj//q7CdrM8Gsi3IrYw8+DKUyik8MxncbeGhy/l091tjCHGLbpA+pxJYQYJLi6SbWB O4MVE/COeQen5EORbTrVW+Ypk/BCPJI5fVlV0/NFT8NUsmEOJLHjuNIELlIl/qQN+Uds Ep/KcCswNo+kUG8Pe2ep9gYgqWWZlInQbNsb7im+Al1m3NTX6TPfAuVwmCF8XueVUFRl SdAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746545707; x=1747150507; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iFYr91OwhCOxBAXZ9RAJciS7sp4dMZW2o+sbdraD8dM=; b=lc51nB+7+WNRUJRxytItu3VjUQUKgjEOQajbzDowOYoLsXAMXQmzKjdSQFEAkYuybq wZS4oxm8U8ElLQcFpkeIzRx9sJ1mGgAIM1UA4D1H05BhVZi4x3Ng6FLeb+BUIZKfgyOt 3jedkANW9+4HJXQ1TwNlZRcTfI1r7ITP5B9iyJ7rE6ZGPpfcvNtB9xzWrcucIxjc723c WLMuzOUgo9r3IrbJOBamyRVLSYk5lNZU6sOUggaOGWrE5viv0pj642v7Y7oWaDoeMNao xFRrAZDi2FAl+iVk9OIyf5GjKnPeSSPQbJjPvAySNUYkPg11+MznYeSbLHqYxb6JWF+q 9pmA== X-Gm-Message-State: AOJu0YztIpyGZ0jt9qkppxxogRycGe4mmCSBLCXtaeV3BA5wPERDuLHk aF/WhF5q7ynDJ5HzHMrEjKiYna4xmH8cryscD8oa9bdmg2Cv/eY2UxVsRBSLNgTFIRRcBdoDOJa cMrE= X-Gm-Gg: ASbGnct1ids6NwRhovQxyMdpZ1R+86vy4HBugonWkLBZvX8PJeXZjXlyvAnPTjjuvzd PwCx/402XvexFVif6QYBUJMLeXOQptSCcYToV7n1JOoPUw+lyOMdAOaesj+NelD6eop08Jsij/q EosbElw46OKsPjrIziT/bxFi9mc0b1thqymuQ/7dmT66Im0cs2/t/sxYnV+4fFyhyt+wHAOojYW lvOnp0D7kSCC3TqIl02Lyg15TxpXrcJWEjzjNSOq50dGM85EtP+6XROzkE5YqeNK4eXGXbSY7hl fR15jIAAnh9SJ8WxLdbfLXGHwwFNV3XwdoQfZd/Y2zWgBI7Gz6n6Uqysdt8vGYeCHQ36QFKaX4m pRSwPuxlgzBbi6IiUvB4JxSV+5j/fnDTWuks4OcMH X-Google-Smtp-Source: AGHT+IEbnVGkM7ZIQ1SKEPP9RNAza7l+r0Rp6K9KE9Tg1Ly+QN2pHZ5kbSmLisXac80PbWdHCYV/4g== X-Received: by 2002:a05:622a:11d5:b0:477:6f4a:adb9 with SMTP id d75a77b69052e-48dff3e0b37mr178650721cf.5.1746545707406; Tue, 06 May 2025 08:35:07 -0700 (PDT) Received: from ip-10-117-149-49.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-48b96bd211esm76216971cf.41.2025.05.06.08.35.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 08:35:07 -0700 (PDT) From: Greg Hogan Date: Tue, 6 May 2025 15:34:23 +0000 Message-ID: <0888b883a1d4f0a28e7b097cc59c6b4baabb1595.1746545596.git.code@greghogan.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/serialization.scm (avro-cpp-1.9): Rename to avro-cpp. (avro-cpp): Update to 1.12.0. [source]: Use Apache mirror. [arguments]<#:phases>: Add phase to use system fmt. [inputs]: Add fmt. (avro-cpp-1.9-for-irods): Inherit from avro-cpp. Change-Id: Iee70378ad5452ad51757aadb8f6adaf00fc5bab5 --- gnu/packages/serialization.scm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) base-commit: fa39695bbc0c5f79838cbca55d55eebd821a8efa diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index c0f7001fa05..db8e85f411b 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -70,28 +70,34 @@ (define-module (gnu packages serialization) #:use-module (gnu packages python-check) #:use-module (gnu packages python-science) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages qt) #:use-module (gnu packages time)) -(define-public avro-cpp-1.9 +(define-public avro-cpp (package (name "avro-cpp") - (version "1.9.2") + (version "1.12.0") (source (origin (method url-fetch) (uri (string-append - "https://archive.apache.org/dist/avro/avro-" version + "mirror://apache/avro/avro-" version "/avro-src-" version ".tar.gz")) (sha256 - (base32 "0i3fpm7r72yw397qc8yw9ybzk2mxjkv0yk5hnn00ylc1wbd0np73")))) + (base32 "0ywg7s7m7ngiddcg78hwb34c49yjzal6glcckinvcik2fr9nmg88")))) (build-system cmake-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "lang/c++")))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "lang/c++"))) + (add-after 'chdir 'fix-dependencies + (lambda _ + (substitute* "CMakeLists.txt" + (("^FetchContent_MakeAvailable\\(fmt\\)") + "find_package(fmt REQUIRED)"))))))) (inputs - (list boost snappy)) + (list boost fmt snappy)) (home-page "https://avro.apache.org/") (synopsis "Data serialization system") (description "Apache Avro is a data serialization system. Avro provides: @@ -109,8 +115,16 @@ (define-public avro-cpp-1.9 (define-public avro-cpp-1.9-for-irods (package - (inherit avro-cpp-1.9) + (inherit avro-cpp) (properties `((hidden? . #true))) + (version "1.9.2") + (source (origin + (method url-fetch) + (uri (string-append + "https://archive.apache.org/dist/avro/avro-" version + "/avro-src-" version ".tar.gz")) + (sha256 + (base32 "0i3fpm7r72yw397qc8yw9ybzk2mxjkv0yk5hnn00ylc1wbd0np73")))) (arguments `(#:configure-flags '("-DCMAKE_CXX_COMPILER=clang++"