amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ndctl: Update to 72.

Browse source 
* 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.
This commit is contained in:
Tobias Geerinckx-Rice 2021-12-22 03:46:50 +01:00
parent 2cb8657892
commit f2f2d3010a
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/disk.scm
View file

@ -811,7 +811,7 @@ passphrases.")
(define-public ndctl (define-public ndctl
(package (package
(name "ndctl") (name "ndctl")
(version "71.1") (version "72")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -820,7 +820,7 @@ passphrases.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1vi61bm9wyawklswh9mj9zdp28ar7r97qckwnhgiyila73fb3jx2")))) "1m9kmzqqy395p2zmcaspw2q5ailagi1xy47hkvjp3lfp48zcrpbi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list asciidoc (list asciidoc
@ -835,7 +835,11 @@ passphrases.")
;; Required for offline docbook generation. ;; Required for offline docbook generation.
which)) which))
(inputs (inputs
(list eudev json-c keyutils kmod (list eudev
iniparser
json-c
keyutils
kmod
`(,util-linux "lib"))) `(,util-linux "lib")))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -843,13 +847,16 @@ passphrases.")
"--without-systemd") "--without-systemd")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-include
(lambda _
(substitute* "util/parse-configs.c"
(("iniparser/") ""))))
(add-after 'unpack 'patch-FHS-file-names (add-after 'unpack 'patch-FHS-file-names
(lambda _ (lambda _
(substitute* "git-version-gen" (substitute* "git-version-gen"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
(substitute* "git-version" (substitute* "git-version"
(("/bin/bash") (which "bash"))) (("/bin/bash") (which "bash"))))))
#t)))
#:make-flags #:make-flags
(let ((out (assoc-ref %outputs "out"))) (let ((out (assoc-ref %outputs "out")))
(list (string-append "BASH_COMPLETION_DIR=" out (list (string-append "BASH_COMPLETION_DIR=" out