summary refs log tree commit diff
path: root/nixos/modules/tasks
diff options
context:
space:
mode:
authorRicardo M. Correia <rcorreia@wizy.org>2015-03-19 19:24:39 +0100
committerRicardo M. Correia <rcorreia@wizy.org>2015-03-19 19:37:33 +0100
commit4d2317e6ebe3186989a7e7de7e7ccc7f92c97e90 (patch)
tree3a767c4b4947f6fc881cc22bcc122667f131902e /nixos/modules/tasks
parent20b150b26cb93cd8465b84fe6606c78d3132ae11 (diff)
downloadnixpkgs-4d2317e6ebe3186989a7e7de7e7ccc7f92c97e90.tar
nixpkgs-4d2317e6ebe3186989a7e7de7e7ccc7f92c97e90.tar.gz
nixpkgs-4d2317e6ebe3186989a7e7de7e7ccc7f92c97e90.tar.bz2
nixpkgs-4d2317e6ebe3186989a7e7de7e7ccc7f92c97e90.tar.lz
nixpkgs-4d2317e6ebe3186989a7e7de7e7ccc7f92c97e90.tar.xz
nixpkgs-4d2317e6ebe3186989a7e7de7e7ccc7f92c97e90.tar.zst
nixpkgs-4d2317e6ebe3186989a7e7de7e7ccc7f92c97e90.zip
nixos/zfs: Don't default to git version for kernels >= 3.19
Stable version 0.6.3-1.3 works with kernels 3.19.x.
Diffstat (limited to 'nixos/modules/tasks')
-rw-r--r--nixos/modules/tasks/filesystems/zfs.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 93782ffa4d5..1ac89c4c255 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -55,8 +55,7 @@ in
     boot.zfs = {
       useGit = mkOption {
         type = types.bool;
-        # TODO(wkennington): Revert when 0.6.4 is out
-        default = versionAtLeast config.boot.kernelPackages.kernel.version "3.19";
+        default = false;
         example = true;
         description = ''
           Use the git version of the SPL and ZFS packages.