[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/20: gnu: Open vSwitch: Remove input labels.
From: |
guix-commits |
Subject: |
04/20: gnu: Open vSwitch: Remove input labels. |
Date: |
Sun, 11 Sep 2022 13:46:45 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 8f78e9b0bc7ef3fa479527d87c6d11dd3b8be983
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Sep 10 23:32:37 2022 +0200
gnu: Open vSwitch: Remove input labels.
* gnu/packages/networking.scm (openvswitch)[native-inputs]: Remove labels.
[arguments]: Use SEARCH-INPUT-FILE instead of labels.
---
gnu/packages/networking.scm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index b8d017c753..d43190a8d5 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -2751,13 +2751,12 @@ procedure calls (RPCs).")
(modify-phases %standard-phases
(add-after 'unpack 'use-absolute-/bin/sh
(lambda* (#:key inputs #:allow-other-keys)
- (let* ((bash (assoc-ref inputs "bash-minimal")))
+ (let ((/bin/sh (search-input-file inputs "bin/sh")))
(substitute* "ovsdb/ovsdb-server.c"
- (("/bin/sh") (string-append bash "/bin/sh"))))))
+ (("/bin/sh") /bin/sh)))))
(add-before 'check 'adjust-tests
(lambda* (#:key inputs #:allow-other-keys)
- (let* ((bash (assoc-ref inputs "bash-minimal"))
- (/bin/sh (string-append bash "/bin/sh")))
+ (let ((/bin/sh (search-input-file inputs "bin/sh")))
(with-fluids ((%default-port-encoding "ISO-8859-1"))
(substitute* (find-files "tests" ".*(run|testsuite)$")
(("#! /bin/sh")
@@ -2794,13 +2793,14 @@ ps --no-header -p $1 -o state= | grep -qv '^Z$'"
"DBDIR=/tmp"
"install"))))))
(native-inputs
- `(("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)
- ;; for testing
- ("bash" ,bash) ;for 'compgen'
- ("procps" ,procps)
- ("util-linux" ,util-linux)))
+ (list perl
+ pkg-config
+ python-wrapper
+
+ ;; For testing.
+ bash ;for 'compgen'
+ procps
+ util-linux))
(inputs
(list bash-minimal libcap-ng openssl))
(synopsis "Virtual network switch")
- branch master updated (9f780ff4dd -> 9b3124b2fc), guix-commits, 2022/09/11
- 01/20: gnu: swaylock: Update to 1.6., guix-commits, 2022/09/11
- 02/20: gnu: Open vSwitch: Adjust tests for grep 3.8., guix-commits, 2022/09/11
- 05/20: gnu: Open vSwitch: Update to 3.0.0., guix-commits, 2022/09/11
- 03/20: gnu: Open vSwitch: Add release-monitoring-url., guix-commits, 2022/09/11
- 04/20: gnu: Open vSwitch: Remove input labels.,
guix-commits <=
- 07/20: gnu: mercurial: Update to 6.2.2., guix-commits, 2022/09/11
- 09/20: gnu: libslirp: Update to 4.7.0., guix-commits, 2022/09/11
- 12/20: gnu: python-docutils: Add 0.19., guix-commits, 2022/09/11
- 08/20: gnu: ntp: Adjust for glibc 2.34 and later., guix-commits, 2022/09/11
- 14/20: gnu: python-astunparse: Update to 1.6.3., guix-commits, 2022/09/11
- 16/20: gnu: python-gast: Enable tests., guix-commits, 2022/09/11
- 18/20: gnu: Add python-pyproject-metadata., guix-commits, 2022/09/11
- 19/20: gnu: python-sphinx-theme-builder: Update to 0.2.0b1., guix-commits, 2022/09/11
- 20/20: gnu: Deprecate python-pep621., guix-commits, 2022/09/11
- 06/20: gnu: mercurial: Adjust for grep 3.8., guix-commits, 2022/09/11