[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/38: gnu: isc-dhcp: Remove unnecessary shebang patching.
From: |
guix-commits |
Subject: |
10/38: gnu: isc-dhcp: Remove unnecessary shebang patching. |
Date: |
Sat, 2 Oct 2021 12:52:39 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 0fe0a3a8ee745841ea8d7a14d4132fdcac74a8f2
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Oct 1 16:21:12 2021 +0200
gnu: isc-dhcp: Remove unnecessary shebang patching.
* gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>{post-install}:
Remove parts indicated by TODOs.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
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 744692b..5780120 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
- branch core-updates updated (0cccc2f -> fcaed5b), guix-commits, 2021/10/02
- 01/38: build-system/mozilla: New build system., guix-commits, 2021/10/02
- 04/38: gnu: icecat: Use mozilla-build-system., guix-commits, 2021/10/02
- 08/38: gnu: isc-dhcp: Don't use canonical-package., guix-commits, 2021/10/02
- 09/38: gnu: isc-dhcp: Make an input unconditional., guix-commits, 2021/10/02
- 02/38: gnu: nspr: Use mozilla-build-system., guix-commits, 2021/10/02
- 03/38: gnu: mozjs: Use mozilla-build-system., guix-commits, 2021/10/02
- 05/38: build/minetest-build-system: Move png-file? to (guix build utils)., guix-commits, 2021/10/02
- 10/38: gnu: isc-dhcp: Remove unnecessary shebang patching.,
guix-commits <=
- 06/38: gnu: mozjs: Make the native-inputs unconditional., guix-commits, 2021/10/02
- 07/38: gnu: mozjs: Make the quasiquote unconditional., guix-commits, 2021/10/02
- 11/38: gnu: isc-dhcp: Remove trailing #t., guix-commits, 2021/10/02
- 16/38: gnu: libdatrie: Make input labels match the package name., guix-commits, 2021/10/02
- 14/38: gnu: cairo: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 15/38: gnu: libthai: Make 'datrie' input unconditional., guix-commits, 2021/10/02
- 17/38: gnu: pango: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 13/38: gnu: gobject-introspection: Use python instead of python-wrapper., guix-commits, 2021/10/02
- 21/38: gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 20/38: gnu: gdk-pixbuf: Use target predicates., guix-commits, 2021/10/02