aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/disk.scm
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-12-22 03:46:50 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2021-12-25 07:19:59 +0100
commitf2f2d3010a5e2dcb13321344ec604f9bc3d88d2d (patch)
tree39aeae33ff079d6be0d0b0b1a73f852a9112efc2 /gnu/packages/disk.scm
parent2cb8657892a96007528a2c74ba771fe5118e2beb (diff)
downloadguix-f2f2d3010a5e2dcb13321344ec604f9bc3d88d2d.tar
guix-f2f2d3010a5e2dcb13321344ec604f9bc3d88d2d.tar.gz
gnu: ndctl: Update to 72.
* gnu/packages/disk.scm (ndctl): Update to 72. [arguments]: Add a new 'fix-include phase. Don't explicitly return #t from phases. [inputs]: Add iniparser.
Diffstat (limited to 'gnu/packages/disk.scm')
-rw-r--r--gnu/packages/disk.scm17
1 files changed, 12 insertions, 5 deletions
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 3ab65e60d4..2d7c6797a1 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -811,7 +811,7 @@ passphrases.")
(define-public ndctl
(package
(name "ndctl")
- (version "71.1")
+ (version "72")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -820,7 +820,7 @@ passphrases.")
(file-name (git-file-name name version))
(sha256
(base32
- "1vi61bm9wyawklswh9mj9zdp28ar7r97qckwnhgiyila73fb3jx2"))))
+ "1m9kmzqqy395p2zmcaspw2q5ailagi1xy47hkvjp3lfp48zcrpbi"))))
(build-system gnu-build-system)
(native-inputs
(list asciidoc
@@ -835,7 +835,11 @@ passphrases.")
;; Required for offline docbook generation.
which))
(inputs
- (list eudev json-c keyutils kmod
+ (list eudev
+ iniparser
+ json-c
+ keyutils
+ kmod
`(,util-linux "lib")))
(arguments
`(#:configure-flags
@@ -843,13 +847,16 @@ passphrases.")
"--without-systemd")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-include
+ (lambda _
+ (substitute* "util/parse-configs.c"
+ (("iniparser/") ""))))
(add-after 'unpack 'patch-FHS-file-names
(lambda _
(substitute* "git-version-gen"
(("/bin/sh") (which "sh")))
(substitute* "git-version"
- (("/bin/bash") (which "bash")))
- #t)))
+ (("/bin/bash") (which "bash"))))))
#:make-flags
(let ((out (assoc-ref %outputs "out")))
(list (string-append "BASH_COMPLETION_DIR=" out