diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-29 14:26:20 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-29 14:54:12 +0200 |
commit | 0e3c1e31b1523b04d78c1ce468c869fb004af09d (patch) | |
tree | 44f15acb6114fe168a27fdb7ecc1577dfeaeb75c /nixos/modules/tasks | |
parent | 391549c5f4c1f5f63fb60292e88c3461682eedc4 (diff) | |
download | nixlib-0e3c1e31b1523b04d78c1ce468c869fb004af09d.tar nixlib-0e3c1e31b1523b04d78c1ce468c869fb004af09d.tar.gz nixlib-0e3c1e31b1523b04d78c1ce468c869fb004af09d.tar.bz2 nixlib-0e3c1e31b1523b04d78c1ce468c869fb004af09d.tar.lz nixlib-0e3c1e31b1523b04d78c1ce468c869fb004af09d.tar.xz nixlib-0e3c1e31b1523b04d78c1ce468c869fb004af09d.tar.zst nixlib-0e3c1e31b1523b04d78c1ce468c869fb004af09d.zip |
Remove zfs-git and spl-git
See https://github.com/NixOS/nixpkgs/pull/10042#commitcomment-13422343.
Diffstat (limited to 'nixos/modules/tasks')
-rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index d4b10e9ed09e..675bd3d232a6 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -21,9 +21,9 @@ let kernel = config.boot.kernelPackages; - splKernelPkg = if cfgZfs.useGit then kernel.spl_git else kernel.spl; - zfsKernelPkg = if cfgZfs.useGit then kernel.zfs_git else kernel.zfs; - zfsUserPkg = if cfgZfs.useGit then pkgs.zfs_git else pkgs.zfs; + splKernelPkg = kernel.spl; + zfsKernelPkg = kernel.zfs; + zfsUserPkg = pkgs.zfs; autosnapPkg = pkgs.zfstools.override { zfs = zfsUserPkg; @@ -53,16 +53,6 @@ in options = { boot.zfs = { - useGit = mkOption { - type = types.bool; - default = false; - example = true; - description = '' - Use the git version of the SPL and ZFS packages. - Note that these are unreleased versions, with less testing, and therefore - may be more unstable. - ''; - }; extraPools = mkOption { type = types.listOf types.str; |