gnu: ndctl: Update to 73.
* gnu/packages/disk.scm (ndctl): Update to 73. [build-system]: Switch to Meson. [arguments]: Adjust #:configure-flags accordingly. Remove #:make-flags. [native-inputs]: Remove automake, autoconf, and libtool.
This commit is contained in:
parent
cd81b3bdfd
commit
67a78c0ad6
|
@ -93,6 +93,7 @@ (define-module (gnu packages disk)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system glib-or-gtk)
|
#:use-module (guix build-system glib-or-gtk)
|
||||||
#:use-module (guix build-system go)
|
#:use-module (guix build-system go)
|
||||||
|
#:use-module (guix build-system meson)
|
||||||
#:use-module (guix build-system python)
|
#:use-module (guix build-system python)
|
||||||
#:use-module (guix build-system trivial)
|
#:use-module (guix build-system trivial)
|
||||||
#:use-module (guix build-system scons)
|
#:use-module (guix build-system scons)
|
||||||
|
@ -883,7 +884,7 @@ (define-public volume-key
|
||||||
(define-public ndctl
|
(define-public ndctl
|
||||||
(package
|
(package
|
||||||
(name "ndctl")
|
(name "ndctl")
|
||||||
(version "72.1")
|
(version "73")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
|
@ -892,12 +893,16 @@ (define-public ndctl
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1lvrhlad5n43bal053ihgbwr1k4ka2kscrjwr9rs5xnf2vy7204v"))))
|
"19kp1ly74bj7gavs03q7caci0lqr0rsi5y45zx5m8in4h19xk1kb"))))
|
||||||
(build-system gnu-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:configure-flags
|
(list #:configure-flags
|
||||||
#~(list "--disable-asciidoctor" ; use docbook-xsl instead
|
#~(list (string-append "-Drootprefix=" #$output)
|
||||||
"--without-systemd")
|
(string-append "-Dbashcompletiondir=" #$output
|
||||||
|
"/share/bash-completion/completions")
|
||||||
|
(string-append "-Dsysconfdir=" #$output "/etc")
|
||||||
|
"-Dasciidoctor=disabled" ; use docbook-xsl instead
|
||||||
|
"-Dsystemd=disabled")
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-phases
|
#~(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'fix-version
|
(add-after 'unpack 'fix-version
|
||||||
|
@ -910,17 +915,11 @@ (define-public ndctl
|
||||||
(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"))))))))
|
||||||
#:make-flags
|
|
||||||
#~(list (string-append "BASH_COMPLETION_DIR=" #$output
|
|
||||||
"/share/bash-completion/completions"))))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list asciidoc
|
(list asciidoc
|
||||||
automake
|
|
||||||
autoconf
|
|
||||||
bash-completion
|
bash-completion
|
||||||
docbook-xsl
|
docbook-xsl
|
||||||
libtool
|
|
||||||
libxml2
|
libxml2
|
||||||
pkg-config
|
pkg-config
|
||||||
xmlto
|
xmlto
|
||||||
|
@ -940,7 +939,7 @@ (define-public ndctl
|
||||||
libnvdimm (non-volatile memory device) sub-system in the Linux kernel.")
|
libnvdimm (non-volatile memory device) sub-system in the Linux kernel.")
|
||||||
;; COPYING says LGPL2.1, but many source files are GPL2 so that's
|
;; COPYING says LGPL2.1, but many source files are GPL2 so that's
|
||||||
;; the effective license. Note that some files under ccan/ are
|
;; the effective license. Note that some files under ccan/ are
|
||||||
;; covered by BSD-3 or public domain, see the individual folders.
|
;; covered by BSD-3 or public domain, see the individual directories.
|
||||||
(license license:gpl2)))
|
(license license:gpl2)))
|
||||||
|
|
||||||
(define-public dmraid
|
(define-public dmraid
|
||||||
|
|
Loading…
Reference in a new issue