[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/142: gnu: isc-dhcp: Address TODOs.
From: |
guix-commits |
Subject: |
15/142: gnu: isc-dhcp: Address TODOs. |
Date: |
Mon, 10 Jan 2022 13:07:13 -0500 (EST) |
apteryx pushed a commit to branch version-1.4.0
in repository guix.
commit d3f195f77e7e617497cd3e8cbb89f6966f41b5a7
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Dec 17 15:24:06 2021 -0500
gnu: isc-dhcp: Address TODOs.
* gnu/packages/admin.scm (isc-dhcp): Remove trailing #t.
[phases]{post-install}: Remove the 'native-inputs' argument.
{post-configure}: Do not patch the libexec scripts.
[inputs]{bash}: Remove conditional.
---
gnu/packages/admin.scm | 34 +++++-----------------------------
1 file changed, 5 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 7bd27bb725..617c6098ee 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1206,8 +1206,7 @@ connection alive.")
(("^RELEASETYPE=.*")
(format #f "RELEASETYPE=~a\n" ,bind-release-type))
(("^RELEASEVER=.*")
- (format #f "RELEASEVER=~a\n" ,bind-release-version)))
- #t))
+ (format #f "RELEASEVER=~a\n" ,bind-release-version)))))
,@(if (%current-target-system)
'((add-before 'configure 'fix-bind-cross-compilation
(lambda _
@@ -1216,8 +1215,7 @@ connection alive.")
"--host=$host_alias"))
;; BIND needs a native compiler because the DHCP
;; build system uses the built 'gen' executable.
- (setenv "BUILD_CC" "gcc")
- #t)))
+ (setenv "BUILD_CC" "gcc"))))
'())
(add-after 'configure 'post-configure
(lambda* (#:key outputs #:allow-other-keys)
@@ -1255,11 +1253,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"))
@@ -1282,31 +1276,13 @@ connection alive.")
,(map (lambda (dir)
(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))))))
+ (list inetutils net-tools coreutils sed))))))))))
(native-inputs
(list perl file))
(inputs `(("inetutils" ,inetutils)
- ;; TODO(core-updates): simply make this unconditional
- ,@(if (%current-target-system)
- ;; for wrap-program
- `(("bash" ,(canonical-package bash-minimal)))
- '())
+ ("bash" ,(canonical-package bash-minimal)) ;for wrap-program
,@(if (hurd-target?) '()
`(("net-tools" ,net-tools)
("iproute" ,iproute)))
- branch version-1.4.0 created (now a02c1ce716), guix-commits, 2022/01/10
- 01/142: sitecustomize.py: Honor .pth files., guix-commits, 2022/01/10
- 04/142: gnu: python-packaging-bootstrap: Update to 21.3., guix-commits, 2022/01/10
- 06/142: gnu: python-pyparsing: Update to 3.0.6., guix-commits, 2022/01/10
- 11/142: utils: Fix wrap-script argument handling., guix-commits, 2022/01/10
- 15/142: gnu: isc-dhcp: Address TODOs.,
guix-commits <=
- 09/142: gnu: meson: Update to 0.60.2 and absorb meson-wrapped., guix-commits, 2022/01/10
- 10/142: gnu: Remove meson-0.59 workarounds., guix-commits, 2022/01/10
- 02/142: gnu: libx11: Update to 1.7.3.1., guix-commits, 2022/01/10
- 08/142: gnu: python-flit-core: Update to 3.5.1., guix-commits, 2022/01/10
- 03/142: gnu: mesa: Update to 21.3.2., guix-commits, 2022/01/10
- 16/142: gnu: binutils: Absorb binutils-next., guix-commits, 2022/01/10
- 31/142: gnu: glibmm-2.64: Fix libsigc++ propagation., guix-commits, 2022/01/10
- 19/142: gnu: gobject-introspection: Unconditionally use flex and bison., guix-commits, 2022/01/10
- 14/142: gnu: autoconf-2.69: Repatriate unpatch-shebangs phase from 2.71., guix-commits, 2022/01/10
- 20/142: gnu: mozjs-60: Use quasiquote, addressing TODO., guix-commits, 2022/01/10