amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: maths: Add 'bash' input for 'wrap-program'.

Browse source 
It is required for cross-compilation.

* gnu/packages/maths.scm
(units): Fix indentation, remove trailing #t.
[inputs]: Add bash-minimal and drop labels.
(feedgnuplot)[inputs]: Add bash-minimal.
(vuesz)[inputs]: Likewise.
(lingeling)[inputs]: Likewise.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Ifc89d72147d4dbb268410c236a3a2137cd0712a0
This commit is contained in:
Maxime Devos 2021-07-02 12:06:24 +02:00 • committed by Ludovic Courtès
parent 863aeceb4a
commit c5ae065596
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/maths.scm
View file

@ -472,9 +472,10 @@ programming language.")
"0w3kl58y7fq9paaq8ayn5gwylc4n8jbk6lf42kkcj9ar4i8v8myr")))) "0w3kl58y7fq9paaq8ayn5gwylc4n8jbk6lf42kkcj9ar4i8v8myr"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("readline" ,readline) (list bash-minimal ;for wrap-program
("python" ,python-wrapper) ;for 'units_cur' script readline
("python-requests" ,python-requests))) python-wrapper ;for 'units_cur' script
python-requests))
(arguments (arguments
`(#:phases (modify-phases %standard-phases `(#:phases (modify-phases %standard-phases
(add-after 'install 'wrap-units_cur (add-after 'install 'wrap-units_cur
@ -483,8 +484,8 @@ programming language.")
(bin (string-append out "/bin"))) (bin (string-append out "/bin")))
(wrap-program (string-append bin "/units_cur") (wrap-program (string-append bin "/units_cur")
`("GUIX_PYTHONPATH" ":" prefix `("GUIX_PYTHONPATH" ":" prefix
,(search-path-as-string->list (getenv "GUIX_PYTHONPATH")))) ,(search-path-as-string->list
#t)))))) (getenv "GUIX_PYTHONPATH"))))))))))
(synopsis "Conversion between thousands of scales") (synopsis "Conversion between thousands of scales")
(description (description
"GNU Units converts numeric quantities between units of measure. It "GNU Units converts numeric quantities between units of measure. It
@ -492,8 +493,8 @@ can handle scale changes through adaptive usage of standard scale
prefixes (micro-, kilo-, etc.). It can also handle nonlinear prefixes (micro-, kilo-, etc.). It can also handle nonlinear
conversions such as Fahrenheit to Celsius. Its interpreter is powerful conversions such as Fahrenheit to Celsius. Its interpreter is powerful
enough to be used effectively as a scientific calculator.") enough to be used effectively as a scientific calculator.")
(license license:gpl3+) (license license:gpl3+)
(home-page "https://www.gnu.org/software/units/"))) (home-page "https://www.gnu.org/software/units/")))
(define-public double-conversion (define-public double-conversion
(package (package
@ -1360,7 +1361,7 @@ singular value problems.")
`("PERL5LIB" ":" suffix (,PERL5LIB)) `("PERL5LIB" ":" suffix (,PERL5LIB))
`("PATH" ":" suffix (,(dirname gnuplot)))))))))) `("PATH" ":" suffix (,(dirname gnuplot))))))))))
(inputs (inputs
(list gnuplot perl-list-moreutils vnlog)) (list bash-minimal gnuplot perl-list-moreutils vnlog))
(native-inputs (native-inputs
;; For tests. ;; For tests.
(list perl-ipc-run perl-string-shellquote)) (list perl-ipc-run perl-string-shellquote))
@ -3440,8 +3441,7 @@ ASCII text files using Gmsh's own scripting language.")
(add-after 'unpack 'fix-sip-dir (add-after 'unpack 'fix-sip-dir
(lambda _ (lambda _
(substitute* "pyqtdistutils.py" (substitute* "pyqtdistutils.py"
(("os.path.join\\(sip_dir, 'PyQt5'\\)") "sip_dir")) (("os.path.join\\(sip_dir, 'PyQt5'\\)") "sip_dir"))))
#t))
;; Now we have to pass the correct sip_dir to setup.py. ;; Now we have to pass the correct sip_dir to setup.py.
(replace 'build (replace 'build
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -3449,8 +3449,7 @@ ASCII text files using Gmsh's own scripting language.")
((@@ (guix build python-build-system) call-setuppy) ((@@ (guix build python-build-system) call-setuppy)
"build_ext" "build_ext"
(list (string-append "--sip-dir=" (list (string-append "--sip-dir="
(search-input-directory inputs "share/sip"))) (search-input-directory inputs "share/sip"))))))
#t)))
;; Ensure that icons are found at runtime. ;; Ensure that icons are found at runtime.
(add-after 'install 'wrap-executable (add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -3464,7 +3463,8 @@ ASCII text files using Gmsh's own scripting language.")
;;("python-astropy" ,python-astropy) ;; FIXME: Package this. ;;("python-astropy" ,python-astropy) ;; FIXME: Package this.
qttools-5 python-sip-4)) qttools-5 python-sip-4))
(inputs (inputs
(list ghostscript ;optional, for EPS/PS output (list bash-minimal
ghostscript ;optional, for EPS/PS output
python-dbus python-dbus
python-h5py ;optional, for HDF5 data python-h5py ;optional, for HDF5 data
python-pyqt python-pyqt
@ -9262,7 +9262,7 @@ symbolic reasoning engines that need to reason about polynomial constraints.")
;; values to construct commands (yes, eww), so we ;; values to construct commands (yes, eww), so we
;; can't easily substitute* them. ;; can't easily substitute* them.
'("lglddtrace" "lgluntrace" "lingeling" "plingeling")))))))) '("lglddtrace" "lgluntrace" "lingeling" "plingeling"))))))))
(inputs (list `(,aiger "static") gzip bzip2 xz p7zip)) (inputs (list `(,aiger "static") bash-minimal gzip bzip2 xz p7zip))
(home-page "http://fmv.jku.at/lingeling") (home-page "http://fmv.jku.at/lingeling")
(synopsis "SAT solver") (synopsis "SAT solver")
(description "This package provides a range of SAT solvers, including (description "This package provides a range of SAT solvers, including