me/guix
Archived
1
0
Fork 0
Code Activity

gnu: zfs: Update to 2.1.1.

Browse source 
* gnu/packages/file-systems.scm (zfs): Update to 2.1.1.
[arguments]: Do not return #t from custom phases.

Signed-off-by: Arun Isaac <arunisaac@systemreboot.net>
This commit is contained in:
Kaelyn Takata 2021-09-22 21:25:22 +00:00 • committed by Arun Isaac
parent fed255a3d9
commit 017bf198f4
No known key found for this signature in database
GPG key ID: 2E25EE8B61802BB3
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

@ -9,6 +9,7 @@
;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com> ;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org> ;;; Copyright © 2021 Noisytoot <noisytoot@disroot.org>
;;; Copyright © 2021 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1175,7 +1176,7 @@ with the included @command{xfstests-check} helper.")
(define-public zfs (define-public zfs
(package (package
(name "zfs") (name "zfs")
(version "2.1.0") (version "2.1.1")
(outputs '("out" "module" "src")) (outputs '("out" "module" "src"))
(source (source
(origin (origin
@ -1184,7 +1185,7 @@ with the included @command{xfstests-check} helper.")
"/download/zfs-" version "/download/zfs-" version
"/zfs-" version ".tar.gz")) "/zfs-" version ".tar.gz"))
(sha256 (sha256
(base32 "0kzkggwznp4m3503f2m4lcinbl99jg50j4asrwfpfk1862vdrgb0")))) (base32 "1zsc0zkz5cci6pxc0kwzn3xg72qv2fq65phb768y5dgk1784hkxx"))))
(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
@ -1278,8 +1279,7 @@ with the included @command{xfstests-check} helper.")
(substitute* '("Makefile.am" "Makefile.in") (substitute* '("Makefile.am" "Makefile.in")
(("\\$\\(prefix)/src") (string-append src "/src"))) (("\\$\\(prefix)/src") (string-append src "/src")))
(substitute* (find-files "udev/rules.d/" ".rules.in$") (substitute* (find-files "udev/rules.d/" ".rules.in$")
(("/sbin/modprobe") (string-append kmod "/bin/modprobe")))) (("/sbin/modprobe") (string-append kmod "/bin/modprobe"))))))
#t))
(replace 'build (replace 'build
(lambda _ (invoke "make"))) (lambda _ (invoke "make")))
(replace 'install (replace 'install
@ -1294,8 +1294,8 @@ with the included @command{xfstests-check} helper.")
(string-append "INSTALL_MOD_PATH=" moddir) (string-append "INSTALL_MOD_PATH=" moddir)
"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
#t)))))) "/share/bash-completion/completions"))))))))
(native-inputs (native-inputs
`(("attr" ,attr) `(("attr" ,attr)
("kmod" ,kmod) ("kmod" ,kmod)