summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs/default.nix
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2018-08-13 19:47:30 +0200
committerJörg Thalheim <joerg@thalheim.io>2018-08-13 19:53:50 +0200
commit43595c7884533769a68f92359ca13f06dd62af97 (patch)
tree95c0eab5685a772a0563455e1ac7c4dae4627a30 /pkgs/os-specific/linux/zfs/default.nix
parenta57c8579a84d77288fcb2908fbe9f32b94a20007 (diff)
downloadnixpkgs-43595c7884533769a68f92359ca13f06dd62af97.tar
nixpkgs-43595c7884533769a68f92359ca13f06dd62af97.tar.gz
nixpkgs-43595c7884533769a68f92359ca13f06dd62af97.tar.bz2
nixpkgs-43595c7884533769a68f92359ca13f06dd62af97.tar.lz
nixpkgs-43595c7884533769a68f92359ca13f06dd62af97.tar.xz
nixpkgs-43595c7884533769a68f92359ca13f06dd62af97.tar.zst
nixpkgs-43595c7884533769a68f92359ca13f06dd62af97.zip
zfsLegacyCrypto: remove
This package was only mandatory for migration for people on zfsUnstable
in nixos unstable.
Diffstat (limited to 'pkgs/os-specific/linux/zfs/default.nix')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix26
1 files changed, 1 insertions, 25 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 45edf8945c0..9a1baf8f7b9 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -9,7 +9,7 @@
 , gawk, gnugrep, gnused, systemd
 
 # Kernel dependencies
-, kernel ? null, spl ? null, splUnstable ? null, splLegacyCrypto ? null
+, kernel ? null, spl ? null, splUnstable ? null
 }:
 
 with stdenv.lib;
@@ -194,28 +194,4 @@ in {
 
     spl = splUnstable;
   };
-
-  # TODO: Remove this module before 18.09
-  # also remove boot.zfs.enableLegacyCrypto
-  zfsLegacyCrypto = common {
-    # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = null;
-
-    # this package should point to a version / git revision compatible with the latest kernel release
-    version = "2018-02-01";
-
-    rev = "4c46b99d24a6e71b3c72462c11cb051d0930ad60";
-    sha256 = "011lcp2x44jgfzqqk2gjmyii1v7rxcprggv20prxa3c552drsx3c";
-    isUnstable = true;
-
-    extraPatches = [
-      (fetchpatch {
-        url = "https://github.com/Mic92/zfs/compare/4c46b99d24a6e71b3c72462c11cb051d0930ad60...nixos-zfs-2018-02-01.patch";
-        sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch";
-      })
-    ];
-
-    spl = splLegacyCrypto;
-  };
-
 }