diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-02 12:22:34 +0100 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-02 12:22:34 +0100 |
commit | 25c14c893f05019d746321285acf55d1aa65b943 (patch) | |
tree | 9c0a728b3c723fd171668713e0755a79a2034098 /gnu/packages/maths.scm | |
parent | 71a3dca25cd25f63c8fc17498a9a729e545f1890 (diff) | |
parent | 4a0549be52f3f46fbce61342d8de30f7b83130c5 (diff) | |
download | guix-patches-25c14c893f05019d746321285acf55d1aa65b943.tar guix-patches-25c14c893f05019d746321285acf55d1aa65b943.tar.gz |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/maths.scm')
-rw-r--r-- | gnu/packages/maths.scm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d93a4e019e..f797e18fdd 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1286,7 +1286,7 @@ in the terminal or with an external viewer.") (define-public giza (package (name "giza") - (version "1.3.2") + (version "1.4.1") (source (origin (method git-fetch) @@ -1294,7 +1294,7 @@ in the terminal or with an external viewer.") (url "https://github.com/danieljprice/giza") (commit (string-append "v" version)))) (sha256 - (base32 "1clklh3nzgwrwg80h3k5x65gdymbvcc84c44nql7m4bv9b8rqfsq")) + (base32 "17h8hkhcqlvgryyp5n206fbqpals2vbnjy4f6f1zwj9jiblgi5mj")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs @@ -3488,8 +3488,20 @@ September 2004}") '("configure.log" "make.log" "gmake.log" "test.log" "error.log" "RDict.db" "PETScBuildInternal.cmake" + "configure-hash" ;; Once installed, should uninstall with Guix "uninstall.py"))))) + (add-after 'clean-install 'clear-reference-to-compiler + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Do not retain a reference to GCC and other build only inputs. + (let ((out (assoc-ref outputs "out"))) + (substitute* (string-append out "/lib/petsc/conf/petscvariables") + (("([[:graph:]]+)/bin/gcc") "gcc") + (("([[:graph:]]+)/bin/g\\+\\+") "g++") + (("([[:graph:]]+)/bin/make") "make") + (("([[:graph:]]+)/bin/diff") "diff") + (("([[:graph:]]+)/bin/sed") "sed") + (("([[:graph:]]+)/bin/gfortran") "gfortran"))))) (add-after 'install 'move-examples (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) |