guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

gnu: ganeti: Remove input labels.

Browse source 
* gnu/packages/virtualization.scm (ganeti)[arguments]: Use SEARCH-INPUT-FILE
as appropriate.
[inputs]: Remove labels.
This commit is contained in:
Marius Bakke 2022-01-19 09:42:05 +01:00
parent 4bf79350ea
commit bf34db9914
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 45 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
gnu/packages/virtualization.scm
View file

@ -615,7 +615,7 @@ firmware blobs. You can
(lambda (port) (lambda (port)
(format port "v~a~%" ,version)))))) (format port "v~a~%" ,version))))))
(add-after 'unpack 'patch-absolute-file-names (add-after 'unpack 'patch-absolute-file-names
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
(substitute* '("lib/utils/process.py" (substitute* '("lib/utils/process.py"
"lib/utils/text.py" "lib/utils/text.py"
"src/Ganeti/Constants.hs" "src/Ganeti/Constants.hs"
@ -625,21 +625,22 @@ firmware blobs. You can
"test/py/ganeti.utils.process_unittest.py" "test/py/ganeti.utils.process_unittest.py"
"test/py/ganeti.utils.text_unittest.py" "test/py/ganeti.utils.text_unittest.py"
"test/py/ganeti.utils.wrapper_unittest.py") "test/py/ganeti.utils.wrapper_unittest.py")
(("/bin/sh") (which "sh")) (("/bin/sh") (search-input-file inputs "/bin/sh"))
(("/bin/bash") (which "bash")) (("/bin/bash") (search-input-file inputs "/bin/bash"))
(("/usr/bin/env") (which "env")) (("/usr/bin/env") (search-input-file inputs "/bin/env"))
(("/bin/true") (which "true"))) (("/bin/true") (search-input-file inputs "/bin/true")))
;; This script is called by the node daemon at startup to perform ;; This script is called by the node daemon at startup to perform
;; sanity checks on the cluster IP addresses, and it is also used ;; sanity checks on the cluster IP addresses, and it is also used
;; in a master-failover scenario. Add absolute references to ;; in a master-failover scenario. Add absolute references to
;; avoid propagating these executables. ;; avoid propagating these executables.
(substitute* "tools/master-ip-setup" (substitute* "tools/master-ip-setup"
(("arping") (which "arping")) (("arping") (search-input-file inputs "/bin/arping"))
(("ndisc6") (which "ndisc6")) (("ndisc6") (search-input-file inputs "/bin/ndisc6"))
(("fping") (which "fping")) (("fping") (search-input-file inputs "/sbin/fping"))
(("grep") (which "grep")) (("grep") (search-input-file inputs "/bin/grep"))
(("ip addr") (string-append (which "ip") " addr"))))) (("ip addr") (string-append (search-input-file inputs "/sbin/ip")
" addr")))))
(add-after 'unpack 'override-builtin-PATH (add-after 'unpack 'override-builtin-PATH
(lambda _ (lambda _
;; Ganeti runs OS install scripts and similar with a built-in ;; Ganeti runs OS install scripts and similar with a built-in
@ -829,42 +830,40 @@ firmware blobs. You can
("shelltestrunner" ,shelltestrunner) ("shelltestrunner" ,shelltestrunner)
("tzdata" ,tzdata-for-tests))) ("tzdata" ,tzdata-for-tests)))
(inputs (inputs
`(("arping" ,iputils) ;must be the iputils version (list iputils ;for 'arping'
("curl" ,curl) curl
("fping" ,fping) fping
("iproute2" ,iproute) iproute
("ndisc6" ,ndisc6) ndisc6
("socat" ,socat) socat
("qemu" ,qemu-minimal) ;for qemu-img qemu-minimal ;for qemu-img
("ghc-attoparsec" ,ghc-attoparsec) ghc-attoparsec
("ghc-base64-bytestring" ,ghc-base64-bytestring) ghc-base64-bytestring
("ghc-cryptonite" ,ghc-cryptonite) ghc-cryptonite
("ghc-curl" ,ghc-curl) ghc-curl
("ghc-hinotify" ,ghc-hinotify) ghc-hinotify
("ghc-hslogger" ,ghc-hslogger) ghc-hslogger
("ghc-json" ,ghc-json) ghc-json
("ghc-lens" ,ghc-lens) ghc-lens
("ghc-lifted-base" ,ghc-lifted-base) ghc-lifted-base
("ghc-network" ,ghc-network) ghc-network
("ghc-old-time" ,ghc-old-time) ghc-old-time
("ghc-psqueue" ,ghc-psqueue) ghc-psqueue
("ghc-regex-pcre" ,ghc-regex-pcre) ghc-regex-pcre
("ghc-utf8-string" ,ghc-utf8-string) ghc-utf8-string
("ghc-zlib" ,ghc-zlib) ghc-zlib
;; For the optional metadata daemon.
;; For the optional metadata daemon. ghc-snap-core
("ghc-snap-core" ,ghc-snap-core) ghc-snap-server
("ghc-snap-server" ,ghc-snap-server) python
python-pyopenssl
("python" ,python) python-simplejson
("python-pyopenssl" ,python-pyopenssl) python-pyparsing
("python-simplejson" ,python-simplejson) python-pyinotify
("python-pyparsing" ,python-pyparsing) python-pycurl
("python-pyinotify" ,python-pyinotify) python-bitarray
("python-pycurl" ,python-pycurl) python-paramiko
("python-bitarray" ,python-bitarray) python-psutil))
("python-paramiko" ,python-paramiko)
("python-psutil" ,python-psutil)))
(home-page "https://www.ganeti.org/") (home-page "https://www.ganeti.org/")
(synopsis "Cluster-based virtual machine management system") (synopsis "Cluster-based virtual machine management system")
(description (description