nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

zfsLegacyCrypto: remove

Browse Source 
This package was only mandatory for migration for people on zfsUnstable
in nixos unstable.
This commit is contained in:
Jörg Thalheim 2018-08-13 19:47:30 +02:00
parent a57c8579a8
commit 43595c7884
5 changed files with 6 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/rename.nix
View File

@ -256,6 +256,7 @@ with lib;
(mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
(mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.")
(mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.")
# ZSH
(mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])

27
nixos/modules/tasks/filesystems/zfs.nix
View File

@ -23,11 +23,7 @@ let
kernel = config.boot.kernelPackages;
packages = if config.boot.zfs.enableLegacyCrypto then {
spl = kernel.splLegacyCrypto;
zfs = kernel.zfsLegacyCrypto;
zfsUser = pkgs.zfsLegacyCrypto;
} else if config.boot.zfs.enableUnstable then {
packages = if config.boot.zfs.enableUnstable then {
spl = kernel.splUnstable;
zfs = kernel.zfsUnstable;
zfsUser = pkgs.zfsUnstable;
@ -117,27 +113,6 @@ in
'';
};
enableLegacyCrypto = mkOption {
type = types.bool;
default = false;
description = ''
Enabling this option will allow you to continue to use the old format for
encrypted datasets. With the inclusion of stability patches the format of
encrypted datasets has changed. They can still be accessed and mounted but
in read-only mode mounted. It is highly recommended to convert them to
the new format.
This option is only for convenience to people that cannot convert their
datasets to the new format yet and it will be removed in due time.
For migration strategies from old format to this new one, check the Wiki:
https://nixos.wiki/wiki/NixOS_on_ZFS#Encrypted_Dataset_Format_Change
See https://github.com/zfsonlinux/zfs/pull/6864 for more details about
the stability patches.
'';
};
extraPools = mkOption {
type = types.listOf types.str;
default = [];

7
pkgs/os-specific/linux/spl/default.nix
View File

@ -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 ];
};
}

26
pkgs/os-specific/linux/zfs/default.nix
View File

@ -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;
};
}

6
pkgs/top-level/all-packages.nix
View File

@ -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;