diff options
| author | Robin Gloster <mail@glob.in> | 2017-07-27 19:00:54 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-07-27 19:00:54 +0200 |
| commit | 2799a94963aaf37f059b5ed4c0d2b0cf98ba445e (patch) | |
| tree | 568de9fa0a8da54a28732a1847421245a906fb80 /nixos | |
| parent | 688dc4e4c3fd76cc77c75839082631d88c942794 (diff) | |
| download | nixlib-2799a94963aaf37f059b5ed4c0d2b0cf98ba445e.tar nixlib-2799a94963aaf37f059b5ed4c0d2b0cf98ba445e.tar.gz nixlib-2799a94963aaf37f059b5ed4c0d2b0cf98ba445e.tar.bz2 nixlib-2799a94963aaf37f059b5ed4c0d2b0cf98ba445e.tar.lz nixlib-2799a94963aaf37f059b5ed4c0d2b0cf98ba445e.tar.xz nixlib-2799a94963aaf37f059b5ed4c0d2b0cf98ba445e.tar.zst nixlib-2799a94963aaf37f059b5ed4c0d2b0cf98ba445e.zip | |
zfs, spl: 0.6.5.11 -> 0.7.0
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1709.xml | 6 | ||||
| -rw-r--r-- | nixos/modules/rename.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 19 |
3 files changed, 8 insertions, 18 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 72dfd60bedd9..77ee9052fe52 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -157,6 +157,12 @@ rmdir /var/lib/ipfs/.ipfs module where user Fontconfig settings are available. </para> </listitem> + <listitem> + <para> + ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable, splUnstable</literal> + have therefore been removed. + </para> + </listitem> </itemizedlist> diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index c3fb5758edeb..08146d1f5687 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -204,6 +204,7 @@ with lib; "Set the option `services.xserver.displayManager.sddm.package' instead.") (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") + (mkRemovedOptionModule [ "boot" "zfs" "enableUnstable" ] "0.7.0 is now the default") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 2de3a3d8a330..f300091b11ee 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -24,11 +24,7 @@ let kernel = config.boot.kernelPackages; - packages = if config.boot.zfs.enableUnstable then { - spl = kernel.splUnstable; - zfs = kernel.zfsUnstable; - zfsUser = pkgs.zfsUnstable; - } else { + packages = { spl = kernel.spl; zfs = kernel.zfs; zfsUser = pkgs.zfs; @@ -62,19 +58,6 @@ in options = { boot.zfs = { - enableUnstable = mkOption { - type = types.bool; - default = false; - description = '' - Use the unstable zfs package. This might be an option, if the latest - kernel is not yet supported by a published release of ZFS. Enabling - this option will install a development version of ZFS on Linux. The - version will have already passed an extensive test suite, but it is - more likely to hit an undiscovered bug compared to running a released - version of ZFS on Linux. - ''; - }; - extraPools = mkOption { type = types.listOf types.str; default = []; |