From f48805713f900b1e2832dc1078198b35e356a5c7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 9 Dec 2025 10:33:43 +0000 Subject: [PATCH] gnu: netcdf: Update to 4.9.2. * gnu/packages/maths.scm (netcdf): Update to 4.9.2. [arguments] : Remove not required GCC 1.14 workaround options, silent "--enable-doxygen" for now; provide "--with-plugin-dir" : Add 'fix-tests. [inputs]: Remove unzip; add bzip2 and zstd. [native-inputs]: Add unzip. Change-Id: Ib82e80328d9b0d991e40c99e031a8612c915177f Signed-off-by: Rutherther --- gnu/packages/maths.scm | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index b456638ec9fbce16d0c9e67566e557adaca58233..9948b86b51143c714272a3cec5ba0675cfd0023a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2505,7 +2505,7 @@ similar to MATLAB, GNU Octave or SciPy.") (define-public netcdf (package (name "netcdf") - (version "4.9.0") + (version "4.9.2") (source (origin (method url-fetch) @@ -2514,33 +2514,49 @@ similar to MATLAB, GNU Octave or SciPy.") "/netcdf-c-" version ".tar.gz")) (sha256 (base32 - "0j8b814mjdqvqanzmrxpq8hn33n22cdzb3gf9vhya24wnwi615ac")) + "0j3c3amzvsd8bd52dqgqa8gkgl7n36qf0yahyl4kz5mrpnxvl4fg")) (modules '((guix build utils))) (snippet ;; Make sure this variable is defined only once. Failing to do so ;; would break builds of 'netcdf-parallel-openmpi' with a ;; multiple-definition link error with GCC 10. '(substitute* "ncdump/ocprint.c" - (("^int ocdebug") "static int ocdebug"))) + (("^int ocdebug") "static int ocdebug"))) (patches (search-patches "netcdf-date-time.patch")))) (build-system gnu-build-system) (native-inputs - (list doxygen graphviz m4)) + (list doxygen + graphviz + m4 + unzip)) (inputs (list curl + bzip2 hdf5 libaec libjpeg-turbo libxml2 - unzip - zlib)) + zlib + zstd)) (arguments (list #:configure-flags - #~'("CFLAGS=-g -O2 -Wno-error=incompatible-pointer-types" - "--enable-doxygen" "--enable-dot" - "--disable-dap-remote-tests") + #~(list "--disable-dap-remote-tests" + ;; XXX: ... docs/internal.md' does not exist + ;; "--enable-doxygen" + "--enable-dot" + "--enable-netcdf-4" + (string-append "--with-plugin-dir=" #$output "/lib/hdf5-plugins")) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda* (#:key inputs #:allow-other-keys) + ;; Network access is required for these tests. + (substitute* (list "ncdap_test/Makefile.am" + "ncdap_test/Makefile.in") + (("testurl.sh") "")) + (substitute* "nczarr_test/Makefile.in" + (("/bin/bash") + (search-input-file inputs "bin/bash"))))) (add-before 'configure 'fix-source-date (lambda _ ;; As we ${SOURCE_DATE_EPOCH} evaluates to "1" in the build