[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50905] [PATCH core-updates v2 10/38] gnu: isc-dhcp: Remove unnecess
From: |
Maxime Devos |
Subject: |
[bug#50905] [PATCH core-updates v2 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching. |
Date: |
Fri, 1 Oct 2021 16:21:12 +0200 |
* gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>{post-install}:
Remove parts indicated by TODOs.
---
gnu/packages/admin.scm | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 744692bb6c..57801200bd 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1267,11 +1267,7 @@ connection alive.")
"--owner=root:0"
"--group=root:0")))))
(add-after 'install 'post-install
- ;; TODO(core-updates): native-inputs isn't required anymore.
- (lambda* (#:key ,@(if (%current-target-system)
- '(native-inputs)
- '())
- inputs outputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
;; Install the dhclient script for GNU/Linux and make sure
;; if finds all the programs it needs.
(let* ((out (assoc-ref outputs "out"))
@@ -1295,19 +1291,6 @@ connection alive.")
(string-append dir "/bin:"
dir "/sbin"))
(list inetutils net-tools coreutils sed))))
- ;; TODO(core-updates): should not be required anymore,
- ;; once <https://issues.guix.gnu.org/49290> has been merged.
- ,@(if (%current-target-system)
- '((for-each
- (lambda (file)
- (substitute* file
- (((assoc-ref native-inputs "bash"))
- (assoc-ref inputs "bash"))))
- (list (string-append libexec
- "/dhclient-script")
- (string-append libexec
- "/.dhclient-script-real"))))
- '())
#t))))))
(native-inputs
--
2.33.0
- [bug#50905] [PATCH core-updates v2 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs., (continued)
- [bug#50905] [PATCH core-updates v2 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 17/38] gnu: pango: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 36/38] gnu: libproxy: Respect #:tests?., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 33/38] gnu: heimdal: Make some parts of phases unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 03/38] gnu: mozjs: Use mozilla-build-system., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 35/38] gnu: libcap: Unconditionally use #$output., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 07/38] gnu: mozjs: Make the quasiquote unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching.,
Maxime Devos <=
- [bug#50905] [PATCH core-updates v2 05/38] build/minetest-build-system: Move png-file? to (guix build utils)., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 14/38] gnu: cairo: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 15/38] gnu: libthai: Make 'datrie' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 20/38] gnu: gdk-pixbuf: Use target predicates., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 27/38] gnu: avahi: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/10/01
- [bug#50905] [PATCH core-updates v2 22/38] gnu: gdk-pixbuf: Remove trailing #t., Maxime Devos, 2021/10/01