diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2018-08-13 19:47:30 +0200 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2018-08-13 19:53:50 +0200 |
commit | 43595c7884533769a68f92359ca13f06dd62af97 (patch) | |
tree | 95c0eab5685a772a0563455e1ac7c4dae4627a30 /pkgs | |
parent | a57c8579a84d77288fcb2908fbe9f32b94a20007 (diff) | |
download | nixpkgs-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')
-rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 7 | ||||
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 26 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 4 insertions, 35 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 880da81c42e..43711f92209 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -73,11 +73,4 @@ in sha256 = "07qlx7l23y696gzyy7ynly7n1141w66y21gkmxiia2xwldj8klkx"; patches = [ ./install_prefix.patch ]; }; - - splLegacyCrypto = common { - version = "2018-01-24"; - rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771"; - sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h"; - patches = [ ./install_prefix.patch ]; - }; } 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; - }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74af33761c3..fab09745a42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14024,7 +14024,7 @@ with pkgs; sch_cake = callPackage ../os-specific/linux/sch_cake { }; inherit (callPackage ../os-specific/linux/spl {}) - splStable splUnstable splLegacyCrypto; + splStable splUnstable; spl = splStable; @@ -14057,7 +14057,7 @@ with pkgs; inherit (callPackage ../os-specific/linux/zfs { configFile = "kernel"; inherit kernel spl; - }) zfsStable zfsUnstable zfsLegacyCrypto; + }) zfsStable zfsUnstable; zfs = zfsStable; }); @@ -14605,7 +14605,7 @@ with pkgs; inherit (callPackage ../os-specific/linux/zfs { configFile = "user"; - }) zfsStable zfsUnstable zfsLegacyCrypto; + }) zfsStable zfsUnstable; zfs = zfsStable; |