From 30d7ec81f1ad37f2f3771f1ce70bd5be310e4a15 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 16 Nov 2025 22:40:20 +0000 Subject: [PATCH] gnu: python-camb: Update to 1.6.5. * gnu/packages/astronomy.scm (python-camb): Update to 1.6.5. [source]: Switch to git-fetch, unbundle forutils. [arguments] : Move here from custom 'check. : Use default 'check; add 'copy-forutils. [native-inputs]: Add fortran-forutils. Change-Id: I11c3e220b9cd241d87aef697d681ac37beb2a8d0 --- gnu/packages/astronomy.scm | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index db4f1c4f4dc433baef9a9cbd376ec1720220faa8..4a43846a4332301a577125be5d86aec3029af896 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) + #:use-module (gnu packages fortran-xyz) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages geo) @@ -3373,26 +3374,35 @@ Origins Spectrograph}.") (define-public python-camb (package (name "python-camb") - (version "1.6.4") + (version "1.6.5") (source (origin - (method url-fetch) - (uri (pypi-uri "camb" version)) + (method git-fetch) ;XXX: PyPI archive bundles forutils. + (uri (git-reference + (url "https://github.com/cmbant/CAMB") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1l9c8s263i3zgs50sn000yw0vyhrk56rvfcv18pwxs1zbq8bw0si")))) + (base32 "1axqgxvp6id9d600zn6529ypi0ygf6qvd2p0z99dr90prcrr3qva")))) (build-system pyproject-build-system) (arguments (list - #:test-flags - #~(list "-m" "unittest" "camb.tests.camb_test") + #:test-backend #~'unittest + #:test-flags #~(list "camb.tests.camb_test") #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? test-flags #:allow-other-keys) - (when tests? - (apply invoke "python" test-flags))))))) + ;; XXX: It may be set via FORUTILSPATH environemnt variable but + ;; build fails with error: + ;; mkdir: cannot create directory ‘Releaselib’: Read-only file system + (add-after 'unpack 'copy-forutils + (lambda _ + ;; It's a git sumbodule to . + (copy-recursively + #+(package-source (this-package-native-input "fortran-forutils")) + "forutils")))))) (native-inputs - (list gfortran + (list fortran-forutils + gfortran python-packaging python-setuptools which)) ; for fortran/Makefile