git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #56886 from Mic92/zfs-0.7.13

zfs: 0.7.12 -> 0.7.13

commit756e7cd84e38dd7dd2e80200e85a238bbe6a3628 authorJörg Thalheim <Mic92@users.noreply.github.com> dateTue 5 Mar 2019, 16:52 (8 years ago) parent2ac764d6b36c71
3 files changed+20−12
pkgs/os-specific/linux/spl/default.nix+3−3 pkgs/os-specific/linux/spl/install_prefix.patch+10−4 pkgs/os-specific/linux/zfs/default.nix+7−5
pkgs/os-specific/linux/spl/default.nix+3−3
@@ -1,5 +1,5 @@
11{ fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk
2−
2+, fetchpatch
33# Kernel dependencies
44, kernel
55}:
@@ -10,13 +10,13 @@ assert kernel != null;
1010
1111stdenv.mkDerivation rec {
1212 name = "spl-${version}-${kernel.version}";
13− version = "0.7.12";
13+ version = "0.7.13";
1414
1515 src = fetchFromGitHub {
1616 owner = "zfsonlinux";
1717 repo = "spl";
1818 rev = "spl-${version}";
19− sha256 = "13zqh1g132g63zv54l3bsg5kras9mllkx9wvlnfs13chfr7vpp4p";
19+ sha256 = "1rzqgiszy8ad2gx20577azp1y5jgad0907slfzl5y2zb05jgaipa";
2020 };
2121
2222 patches = [ ./install_prefix.patch ];
pkgs/os-specific/linux/spl/install_prefix.patch+10−4
@@ -136,14 +136,12 @@ index 7faab0a..8148b3d 100644
136136+kerneldir = @prefix@/libexec/spl/include/vm
137137 kernel_HEADERS = $(KERNEL_H)
138138 endif
139−diff --git a/module/Makefile.in b/module/Makefile.in
140−index d4e62e1..73fa01c 100644
141139--- a/module/Makefile.in
142140+++ b/module/Makefile.in
143−@@ -21,15 +21,15 @@ clean:
141+@@ -21,22 +21,22 @@
144142 modules_install:
145143 @# Install the kernel modules
146− $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
144+ $(MAKE) -C @LINUX_OBJ@ M=`pwd` $@ \
147145- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
148146+ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \
149147 INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
@@ -160,3 +158,11 @@ index d4e62e1..73fa01c 100644
160158 if [ -f $$sysmap ]; then \
161159 depmod -ae -F $$sysmap @LINUX_VERSION@; \
162160 fi
161+
162+ modules_uninstall:
163+ @# Uninstall the kernel modules
164+- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@
165++ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@
166+ list='$(subdir-m)'; for subdir in $$list; do \
167+ $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \
168+ done
pkgs/os-specific/linux/zfs/default.nix+7−5
@@ -159,17 +159,18 @@ in {
159159 # to be adapted
160160 zfsStable = common {
161161 # comment/uncomment if breaking kernel versions are known
162− incompatibleKernelVersion = "4.20";
162+ # incompatibleKernelVersion = "4.20";
163163
164164 # this package should point to the latest release.
165− version = "0.7.12";
165+ version = "0.7.13";
166166
167− sha256 = "1j432nb3a86isghdysir9xi6l5djmb5fbc5s9zr0rwg4ziisskbh";
167+ sha256 = "1l77bq7pvc54vl15pnrjd0njgpf00qjzy0x85dpfh5jxng84x1fb";
168168
169169 extraPatches = [
170+ # in case this gets out of date, just send Mic92 a pull request!
170171 (fetchpatch {
171− url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";
172− sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh";
172+ url = "https://github.com/Mic92/zfs/commit/cf23c1d38bfc698a8a729fc0c5f9ca41591f4d95.patch";
173+ sha256 = "14v3x9ipvg2qd1vyf70nv909jd5zdxlsw5y8k60pfyvwm7g80wr5";
173174 })
174175 ];
175176
@@ -187,6 +188,7 @@ in {
187188 isUnstable = true;
188189
189190 extraPatches = [
191+ # in case this gets out of date, just send Mic92 a pull request!
190192 (fetchpatch {
191193 url = "https://github.com/Mic92/zfs/commit/bc29b5783da0af2c80c85126a1831ce1d52bfb69.patch";
192194 sha256 = "1sdcr1w2jp3djpwlf1f91hrxxmc34q0jl388smdkxh5n5bpw5gzw";