tjh.dev
fork
Configure Feed
Select the types of activity you want to include in your feed.
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
fork
Configure Feed
Select the types of activity you want to include in your feed.
zfs: 0.6.5.3 -> 0.6.5.4
+12
-11
+2
-2
pkgs/os-specific/linux/zfs/default.nix
+2
-2
pkgs/os-specific/linux/zfs/default.nix
···
20
20
stdenv.mkDerivation rec {
21
21
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
22
22
23
-
version = "0.6.5.3";
23
+
version = "0.6.5.4";
24
24
25
25
src = fetchFromGitHub {
26
26
owner = "zfsonlinux";
27
27
repo = "zfs";
28
28
rev = "zfs-${version}";
29
-
sha256 = "1hq65kq50hzhd1zqgyzqq2whg1fckigq8jmhhdsnbwrwmx5y76lh";
29
+
sha256 = "10zf1kdgmdiaaa3zmz4sz5aj5ql6v24wcwixlxbwhwc51mr46k50";
30
30
};
31
31
32
32
patches = [ ./nix-build.patch ];
+10
-9
pkgs/os-specific/linux/zfs/nix-build.patch
+10
-9
pkgs/os-specific/linux/zfs/nix-build.patch
···
1
1
diff --git a/Makefile.am b/Makefile.am
2
-
index 49b417a..f4af44d 100644
2
+
index f8abb5f..82e8fb6 100644
3
3
--- a/Makefile.am
4
4
+++ b/Makefile.am
5
-
@@ -12,10 +12,10 @@ endif
5
+
@@ -11,10 +11,10 @@ endif
6
6
if CONFIG_KERNEL
7
7
SUBDIRS += module
8
8
···
28
28
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
29
29
endif
30
30
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
31
-
index d00b1c8..3242d2e 100644
31
+
index 595d1db..d41375d 100644
32
32
--- a/include/linux/Makefile.am
33
33
+++ b/include/linux/Makefile.am
34
-
@@ -17,6 +17,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
34
+
@@ -18,6 +18,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
35
35
endif
36
36
37
37
if CONFIG_KERNEL
···
40
40
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
41
41
endif
42
42
diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
43
-
index 7ddace0..8da3870 100644
43
+
index 77ecfb2..52b3612 100644
44
44
--- a/include/sys/Makefile.am
45
45
+++ b/include/sys/Makefile.am
46
-
@@ -102,6 +102,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
46
+
@@ -114,6 +114,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
47
47
endif
48
48
49
49
if CONFIG_KERNEL
···
88
88
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
89
89
endif
90
90
diff --git a/module/Makefile.in b/module/Makefile.in
91
-
index 686402b..9cbf598 100644
91
+
index d4ddee2..876c811 100644
92
92
--- a/module/Makefile.in
93
93
+++ b/module/Makefile.in
94
94
@@ -18,9 +18,9 @@ modules:
···
107
107
"*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
108
108
exit 1; \
109
109
fi
110
-
+ @# when copying a file out of the nix store, we need to make it writable again.
110
+
+ @# when copying a file out of the nix store, we need to make it writable again.
111
111
+ chmod +w @SPL_SYMBOLS@
112
112
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
113
113
···
122
122
KERNELRELEASE=@LINUX_VERSION@
123
123
@# Remove extraneous build products when packaging
124
124
- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
125
+
- if [ -n "$(DESTDIR)" ]; then \
125
126
+ kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
126
-
if [ -n $$kmoddir ]; then \
127
+
+ if [ -n "@prefix@" ]; then \
127
128
find $$kmoddir -name 'modules.*' | xargs $(RM); \
128
129
fi
129
130
- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \