From patchwork Wed Mar 26 15:51:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 40854 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 567A327BBEA; Wed, 26 Mar 2025 15:56:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 BD14127BBE2 for ; Wed, 26 Mar 2025 15:56:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txT6v-000207-Jm; Wed, 26 Mar 2025 11:56:09 -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 1txT6o-0001zT-HV for guix-patches@gnu.org; Wed, 26 Mar 2025 11:56: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 1txT6o-0000VX-8G for guix-patches@gnu.org; Wed, 26 Mar 2025 11:56:02 -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:Subject; bh=IZsBChyG4S4nOeE8vfRWmTskhDs3V0Ej9eFEYZXG4kI=; b=rscLs3NMWg3FmHB/8L3q+p9UP4UNwXULlS3z7SXDu1GWkq9pS01sO0Gs3mfpOdz/9gJrYT3sr6djYyyMfmhyDPFsBsp29Is5sH+DuMnZq+61SnSVU0nlvVol0yrrdgw0O/jIGoJEdq26h0l3K+u94xB6vNK1HHlvmH2e84p+zPEnmGukBwTdqFLREYG7dOV5BxrAyo2yY9wOFadvgEy/jGDvAel0AMDK5vKfEK+xuaOVZ0VEPB37fpEi4EFjTnrFe4M3/jIyz63pD0vo7cghon9asMyJDbyj70UbGCuYa8XQ5crU00dC6YVbd11y9vtwwGEACEZLLvCLIZQ9QJaGQA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txT6n-0006FK-SE; Wed, 26 Mar 2025 11:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77287] [PATCH] gnu: hdf5: Make hdf@1.14 the default version. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 26 Mar 2025 15:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77287 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77287@debbugs.gnu.org Cc: Andreas Enge , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.174300452123955 (code B ref -1); Wed, 26 Mar 2025 15:56:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Mar 2025 15:55:21 +0000 Received: from localhost ([127.0.0.1]:43980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txT69-0006EI-05 for submit@debbugs.gnu.org; Wed, 26 Mar 2025 11:55:21 -0400 Received: from lists.gnu.org ([2001:470:142::17]:44038) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1txT65-0006Cl-RR for submit@debbugs.gnu.org; Wed, 26 Mar 2025 11:55:19 -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 1txT5w-0001nT-SQ for guix-patches@gnu.org; Wed, 26 Mar 2025 11:55:09 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txT5t-0000DZ-Ii for guix-patches@gnu.org; Wed, 26 Mar 2025 11:55:08 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id A3F573FC; Wed, 26 Mar 2025 16:55:02 +0100 (CET) Authentication-Results: hera.aquilenet.fr; none X-Virus-Scanned: Debian amavis at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP id G7gfqyXpuy12; Wed, 26 Mar 2025 16:55:01 +0100 (CET) Received: from jurong.lan (176-179-191-150.abo.bbox.fr [176.179.191.150]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 58D2F3B2; Wed, 26 Mar 2025 16:55:01 +0100 (CET) From: Andreas Enge Date: Wed, 26 Mar 2025 16:51:56 +0100 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: A3F573FC X-Spamd-Result: default: False [-2.60 / 15.00]; NEURAL_HAM(-3.00)[-1.000]; BAYES_HAM(-3.00)[100.00%]; FORGED_RECIPIENTS(2.00)[m:andreas@enge.fr,s:andreas.enge@aquilenet.fr]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_TWO(0.00)[2]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[] X-Rspamd-Action: no action X-Spamd-Bar: -- X-Rspamd-Server: hera Received-SPF: pass client-ip=185.233.100.1; envelope-from=andreas@enge.fr; helo=hera.aquilenet.fr X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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/maths.scm (hdf5-1.14): Rename to... (hdf5): ...this, which was previously defined as hdf5-1.10. (hdf-eos5, hdf5-parallel-openmpi, scilab): Adapt variable names. Change-Id: Ie43a13ecbb4da597ec1d3f7c0428102b45881485 --- The following patch makes hdf5@1.14 the default, so that packages will depend on this version instead of hdf5@1.10. We need to check which dependents fail to build; for the time being, we can then replace their inputs with hdf5@1.10. In the long run, this version of hdf5 should be removed since it is not maintained any more, see https://issues.guix.gnu.org/64448 This patch also does not update hdf-java. gnu/packages/maths.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) base-commit: ea41557c9f8bb8670e25a389a408d0112ea6aa34 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8baf3a0a7f..2fe2c6ddde 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1795,7 +1795,7 @@ (define-public hdf5-1.10 (base32 "14gih7kmjx4h3lc7pg4fwcl28hf1qqkf2x7rljpxqvzkjrqbxi00")) (patches (search-patches "hdf5-config-date.patch")))))) -(define-public hdf5-1.14 +(define-public hdf5 (package (inherit hdf5-1.8) (version "1.14.3") @@ -1833,10 +1833,6 @@ (define-public hdf5-1.14 (("@UNAME_INFO@") "Linux")))))))))) -(define-public hdf5 - ;; Default version of HDF5. - hdf5-1.10) - ;; Keep this in sync with the current hdf5 package. (define-public hdf-java (package @@ -2002,7 +1998,7 @@ (define-public hdf-eos5 (list autoconf automake gfortran libtool)) (build-system gnu-build-system) (inputs - (list hdf5-1.14 zlib gctp)) + (list hdf5 zlib gctp)) (arguments (list #:configure-flags ''("--enable-install-include" "--enable-shared" @@ -2037,13 +2033,13 @@ (define-public hdf-eos5 (license (license:non-copyleft home-page)))) (define-public hdf5-parallel-openmpi - (package/inherit hdf5-1.14 ;use the latest + (package/inherit hdf5 (name "hdf5-parallel-openmpi") (inputs `(("mpi" ,openmpi) ,@(package-inputs hdf5))) (arguments - (substitute-keyword-arguments (package-arguments hdf5-1.14) + (substitute-keyword-arguments (package-arguments hdf5) ((#:configure-flags flags) #~(cons "--enable-parallel" (delete "--enable-cxx" @@ -10588,7 +10584,7 @@ (define-public scilab curl fftw gettext-minimal - hdf5-1.14 + hdf5 libarchive libx11 libxml2