[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/09: gnu: ganeti: Remove input labels.
From: |
guix-commits |
Subject: |
09/09: gnu: ganeti: Remove input labels. |
Date: |
Wed, 19 Jan 2022 04:08:26 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit bf34db9914c00280e7bfedb0c48bbf3ebc2debd2
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Jan 19 09:42:05 2022 +0100
gnu: ganeti: Remove input labels.
* gnu/packages/virtualization.scm (ganeti)[arguments]: Use SEARCH-INPUT-FILE
as appropriate.
[inputs]: Remove labels.
---
gnu/packages/virtualization.scm | 91 ++++++++++++++++++++---------------------
1 file changed, 45 insertions(+), 46 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index e02eafe7c8..2269901d46 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -615,7 +615,7 @@ firmware blobs. You can
(lambda (port)
(format port "v~a~%" ,version))))))
(add-after 'unpack 'patch-absolute-file-names
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(substitute* '("lib/utils/process.py"
"lib/utils/text.py"
"src/Ganeti/Constants.hs"
@@ -625,21 +625,22 @@ firmware blobs. You can
"test/py/ganeti.utils.process_unittest.py"
"test/py/ganeti.utils.text_unittest.py"
"test/py/ganeti.utils.wrapper_unittest.py")
- (("/bin/sh") (which "sh"))
- (("/bin/bash") (which "bash"))
- (("/usr/bin/env") (which "env"))
- (("/bin/true") (which "true")))
+ (("/bin/sh") (search-input-file inputs "/bin/sh"))
+ (("/bin/bash") (search-input-file inputs "/bin/bash"))
+ (("/usr/bin/env") (search-input-file inputs "/bin/env"))
+ (("/bin/true") (search-input-file inputs "/bin/true")))
;; This script is called by the node daemon at startup to perform
;; sanity checks on the cluster IP addresses, and it is also used
;; in a master-failover scenario. Add absolute references to
;; avoid propagating these executables.
(substitute* "tools/master-ip-setup"
- (("arping") (which "arping"))
- (("ndisc6") (which "ndisc6"))
- (("fping") (which "fping"))
- (("grep") (which "grep"))
- (("ip addr") (string-append (which "ip") " addr")))))
+ (("arping") (search-input-file inputs "/bin/arping"))
+ (("ndisc6") (search-input-file inputs "/bin/ndisc6"))
+ (("fping") (search-input-file inputs "/sbin/fping"))
+ (("grep") (search-input-file inputs "/bin/grep"))
+ (("ip addr") (string-append (search-input-file inputs
"/sbin/ip")
+ " addr")))))
(add-after 'unpack 'override-builtin-PATH
(lambda _
;; Ganeti runs OS install scripts and similar with a built-in
@@ -829,42 +830,40 @@ firmware blobs. You can
("shelltestrunner" ,shelltestrunner)
("tzdata" ,tzdata-for-tests)))
(inputs
- `(("arping" ,iputils) ;must be the iputils version
- ("curl" ,curl)
- ("fping" ,fping)
- ("iproute2" ,iproute)
- ("ndisc6" ,ndisc6)
- ("socat" ,socat)
- ("qemu" ,qemu-minimal) ;for qemu-img
- ("ghc-attoparsec" ,ghc-attoparsec)
- ("ghc-base64-bytestring" ,ghc-base64-bytestring)
- ("ghc-cryptonite" ,ghc-cryptonite)
- ("ghc-curl" ,ghc-curl)
- ("ghc-hinotify" ,ghc-hinotify)
- ("ghc-hslogger" ,ghc-hslogger)
- ("ghc-json" ,ghc-json)
- ("ghc-lens" ,ghc-lens)
- ("ghc-lifted-base" ,ghc-lifted-base)
- ("ghc-network" ,ghc-network)
- ("ghc-old-time" ,ghc-old-time)
- ("ghc-psqueue" ,ghc-psqueue)
- ("ghc-regex-pcre" ,ghc-regex-pcre)
- ("ghc-utf8-string" ,ghc-utf8-string)
- ("ghc-zlib" ,ghc-zlib)
-
- ;; For the optional metadata daemon.
- ("ghc-snap-core" ,ghc-snap-core)
- ("ghc-snap-server" ,ghc-snap-server)
-
- ("python" ,python)
- ("python-pyopenssl" ,python-pyopenssl)
- ("python-simplejson" ,python-simplejson)
- ("python-pyparsing" ,python-pyparsing)
- ("python-pyinotify" ,python-pyinotify)
- ("python-pycurl" ,python-pycurl)
- ("python-bitarray" ,python-bitarray)
- ("python-paramiko" ,python-paramiko)
- ("python-psutil" ,python-psutil)))
+ (list iputils ;for 'arping'
+ curl
+ fping
+ iproute
+ ndisc6
+ socat
+ qemu-minimal ;for qemu-img
+ ghc-attoparsec
+ ghc-base64-bytestring
+ ghc-cryptonite
+ ghc-curl
+ ghc-hinotify
+ ghc-hslogger
+ ghc-json
+ ghc-lens
+ ghc-lifted-base
+ ghc-network
+ ghc-old-time
+ ghc-psqueue
+ ghc-regex-pcre
+ ghc-utf8-string
+ ghc-zlib
+ ;; For the optional metadata daemon.
+ ghc-snap-core
+ ghc-snap-server
+ python
+ python-pyopenssl
+ python-simplejson
+ python-pyparsing
+ python-pyinotify
+ python-pycurl
+ python-bitarray
+ python-paramiko
+ python-psutil))
(home-page "https://www.ganeti.org/")
(synopsis "Cluster-based virtual machine management system")
(description
- branch master updated (e45f28f220 -> bf34db9914), guix-commits, 2022/01/19
- 02/09: gnu: python-geventhttpclient: Update to 1.5.3., guix-commits, 2022/01/19
- 03/09: gnu: python-flufl-testing: Explicitly disable tests., guix-commits, 2022/01/19
- 04/09: gnu: Add python-retry., guix-commits, 2022/01/19
- 06/09: gnu: python-pyzmq: Update to 22.3.0., guix-commits, 2022/01/19
- 08/09: gnu: ganeti: Fix test failure., guix-commits, 2022/01/19
- 01/09: gnu: python-flask-cors: Update to 3.0.10., guix-commits, 2022/01/19
- 05/09: gnu: Add python-roundrobin., guix-commits, 2022/01/19
- 07/09: gnu: python-locust: Update to 2.5.1., guix-commits, 2022/01/19
- 09/09: gnu: ganeti: Remove input labels.,
guix-commits <=