Skip to content

Commit 2799a94

Browse files
globinglobin
committedJul 27, 2017
zfs, spl: 0.6.5.11 -> 0.7.0
1 parent 688dc4e commit 2799a94

File tree

6 files changed

+157
-223
lines changed

6 files changed

+157
-223
lines changed
 

‎nixos/doc/manual/release-notes/rl-1709.xml

+6
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,12 @@ rmdir /var/lib/ipfs/.ipfs
157157
module where user Fontconfig settings are available.
158158
</para>
159159
</listitem>
160+
<listitem>
161+
<para>
162+
ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable, splUnstable</literal>
163+
have therefore been removed.
164+
</para>
165+
</listitem>
160166

161167
</itemizedlist>
162168

‎nixos/modules/rename.nix

+1
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ with lib;
204204
"Set the option `services.xserver.displayManager.sddm.package' instead.")
205205
(mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
206206
(mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
207+
(mkRemovedOptionModule [ "boot" "zfs" "enableUnstable" ] "0.7.0 is now the default")
Has comments. Original line has comments.
207208

208209
# ZSH
209210
(mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])

‎nixos/modules/tasks/filesystems/zfs.nix

+1-18
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ let
2424

2525
kernel = config.boot.kernelPackages;
2626

27-
packages = if config.boot.zfs.enableUnstable then {
28-
spl = kernel.splUnstable;
29-
zfs = kernel.zfsUnstable;
30-
zfsUser = pkgs.zfsUnstable;
31-
} else {
27+
packages = {
3228
spl = kernel.spl;
3329
zfs = kernel.zfs;
3430
zfsUser = pkgs.zfs;
@@ -62,19 +58,6 @@ in
6258

6359
options = {
6460
boot.zfs = {
65-
enableUnstable = mkOption {
66-
type = types.bool;
67-
default = false;
68-
description = ''
69-
Use the unstable zfs package. This might be an option, if the latest
70-
kernel is not yet supported by a published release of ZFS. Enabling
71-
this option will install a development version of ZFS on Linux. The
72-
version will have already passed an extensive test suite, but it is
73-
more likely to hit an undiscovered bug compared to running a released
74-
version of ZFS on Linux.
75-
'';
76-
};
77-
7861
extraPools = mkOption {
7962
type = types.listOf types.str;
8063
default = [];

‎pkgs/os-specific/linux/spl/default.nix

+41-51
Original file line numberDiff line numberDiff line change
@@ -6,67 +6,57 @@
66
}:
77

88
with stdenv.lib;
9+
910
let
1011
buildKernel = any (n: n == configFile) [ "kernel" "all" ];
1112
buildUser = any (n: n == configFile) [ "user" "all" ];
13+
in
14+
assert any (n: n == configFile) [ "kernel" "user" "all" ];
15+
assert buildKernel -> kernel != null;
16+
stdenv.mkDerivation rec {
17+
name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
18+
version = "0.7.0";
19+
20+
src = fetchFromGitHub {
21+
owner = "zfsonlinux";
22+
repo = "spl";
23+
rev = "spl-${version}";
24+
sha256 = "05qqwhxc9nj94y28c97iwfz8gkjwicrhnkj425yb47gqa8rafazk";
25+
};
1226

13-
common = { version, sha256 } @ args : stdenv.mkDerivation rec {
14-
name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
15-
16-
src = fetchFromGitHub {
17-
owner = "zfsonlinux";
18-
repo = "spl";
19-
rev = "spl-${version}";
20-
inherit sha256;
21-
};
27+
patches = [ ./const.patch ./install_prefix.patch ];
2228

23-
patches = [ ./const.patch ./install_prefix.patch ];
29+
nativeBuildInputs = [ autoreconfHook ];
2430

25-
nativeBuildInputs = [ autoreconfHook ];
31+
hardeningDisable = [ "pic" ];
2632

27-
hardeningDisable = [ "pic" ];
33+
preConfigure = ''
34+
substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
35+
substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
36+
substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
37+
substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
38+
'';
2839

29-
preConfigure = ''
30-
substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
31-
substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
32-
substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
33-
substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
34-
'';
40+
configureFlags = [
41+
"--with-config=${configFile}"
42+
] ++ optionals buildKernel [
43+
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
44+
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
45+
];
3546

36-
configureFlags = [
37-
"--with-config=${configFile}"
38-
] ++ optionals buildKernel [
39-
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
40-
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
41-
];
47+
enableParallelBuilding = true;
4248

43-
enableParallelBuilding = true;
49+
meta = {
50+
description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
4451

45-
meta = {
46-
description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
47-
48-
longDescription = ''
49-
This kernel module is a porting layer for ZFS to work inside the linux
50-
kernel.
51-
'';
52+
longDescription = ''
53+
This kernel module is a porting layer for ZFS to work inside the linux
54+
kernel.
55+
'';
5256

53-
homepage = http://zfsonlinux.org/;
54-
platforms = platforms.linux;
55-
license = licenses.gpl2Plus;
56-
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
57-
};
57+
homepage = http://zfsonlinux.org/;
58+
platforms = platforms.linux;
59+
license = licenses.gpl2Plus;
60+
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ];
5861
};
59-
60-
in
61-
assert any (n: n == configFile) [ "kernel" "user" "all" ];
62-
assert buildKernel -> kernel != null;
63-
{
64-
splStable = common {
65-
version = "0.6.5.11";
66-
sha256 = "192val8035pj2rryi3fwb134avzirhv5ifaj5021vh8bbjx75pd5";
67-
};
68-
splUnstable = common {
69-
version = "0.7.0-rc5";
70-
sha256 = "17y25g02c9swi3n90lhjvazcnsr69nh50dz3b8g1c08zlz9n2akp";
71-
};
72-
}
62+
}

0 commit comments

Comments
 (0)
Please sign in to comment.