me/guix
Archived
1
0
Fork 0
Code Activity

gnu: zfs: Update to 0.8.5.

Browse source 
* gnu/packages/file-systems.scm (zfs): Update to 0.8.5.
[arguments]: Update.  Don't install initramfs-tools hooks.
This commit is contained in:
Tobias Geerinckx-Rice 2020-11-04 02:45:43 +01:00
parent c90aade8af
commit 2bde4a1d12
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/file-systems.scm
View file

@ -698,7 +698,7 @@ APFS.")
(define-public zfs (define-public zfs
(package (package
(name "zfs") (name "zfs")
(version "0.8.2") (version "0.8.5")
(outputs '("out" "module" "src")) (outputs '("out" "module" "src"))
(source (source
(origin (origin
@ -707,8 +707,7 @@ APFS.")
"/download/zfs-" version "/download/zfs-" version
"/zfs-" version ".tar.gz")) "/zfs-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32 "0gfdnynmsxbhi97q73smrgmcw1k8zmlr1hgljfn38sk0kimivd6v"))))
"1f7aig15q3z832pr2n48j3clafic2yk1vvqlh28vpklfghjqwq27"))))
(build-system linux-module-build-system) (build-system linux-module-build-system)
(arguments (arguments
`(;; The ZFS kernel module should not be downloaded since the license `(;; The ZFS kernel module should not be downloaded since the license
@ -722,8 +721,7 @@ APFS.")
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* "configure" (substitute* "configure"
(("-/bin/sh") (string-append "-" (which "sh"))) (("-/bin/sh") (string-append "-" (which "sh"))))
((" /bin/sh") (string-append " " (which "sh"))))
(invoke "./configure" (invoke "./configure"
"--with-config=all" "--with-config=all"
(string-append "--prefix=" out) (string-append "--prefix=" out)
@ -739,6 +737,9 @@ APFS.")
(src (assoc-ref outputs "src")) (src (assoc-ref outputs "src"))
(util-linux (assoc-ref inputs "util-linux")) (util-linux (assoc-ref inputs "util-linux"))
(nfs-utils (assoc-ref inputs "nfs-utils"))) (nfs-utils (assoc-ref inputs "nfs-utils")))
(substitute* "contrib/Makefile.in"
;; This is not configurable nor is its hard-coded /usr prefix.
((" initramfs") ""))
(substitute* "module/zfs/zfs_ctldir.c" (substitute* "module/zfs/zfs_ctldir.c"
(("/usr/bin/env\", \"umount") (("/usr/bin/env\", \"umount")
(string-append util-linux "/bin/umount\", \"-n")) (string-append util-linux "/bin/umount\", \"-n"))
@ -782,7 +783,6 @@ APFS.")
"INSTALL_MOD_STRIP=1") "INSTALL_MOD_STRIP=1")
(install-file "contrib/bash_completion.d/zfs" (install-file "contrib/bash_completion.d/zfs"
(string-append out "/share/bash-completion/completions")) (string-append out "/share/bash-completion/completions"))
(symlink "../share/pkgconfig/" (string-append out "/lib/pkgconfig"))
#t)))))) #t))))))
(native-inputs (native-inputs
`(("attr" ,attr) `(("attr" ,attr)