diff options
author | Henri Menke <henri@henrimenke.de> | 2021-04-19 09:28:25 +0200 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-04-21 09:08:18 -0700 |
commit | b14062b75c4e8ef4dd4110282f7105be87f681d7 (patch) | |
tree | 096f14bfeb1d70661751cc2bb3d41a9d30cc436f /pkgs/os-specific/linux/zfs | |
parent | 711dbe7dbad712aa671e25894bb5d38abe89c787 (diff) | |
download | nixpkgs-b14062b75c4e8ef4dd4110282f7105be87f681d7.tar nixpkgs-b14062b75c4e8ef4dd4110282f7105be87f681d7.tar.gz nixpkgs-b14062b75c4e8ef4dd4110282f7105be87f681d7.tar.bz2 nixpkgs-b14062b75c4e8ef4dd4110282f7105be87f681d7.tar.lz nixpkgs-b14062b75c4e8ef4dd4110282f7105be87f681d7.tar.xz nixpkgs-b14062b75c4e8ef4dd4110282f7105be87f681d7.tar.zst nixpkgs-b14062b75c4e8ef4dd4110282f7105be87f681d7.zip |
zfsUnstable: 2.0.4 -> 2.1.0-rc3
In https://github.com/openzfs/zfs/commit/658fb802 OpenZFS introduced a new compatibility feature. This is accompanied by some default profiles which are located in the $out output of the Nix derivation. However, these compatibility profiles are used by both the zpool executable located in $out and the libzfs library located in $lib. This inadvertently creates a cycle, because zpool refers to $lib to link against libzfs but libzfs refers back to $out for the compatibility profiles. There are two possible routes to rectify this problem: 1. Patch the zpool source code to not read the compatibility profiles and adjust the build system to put them into the $lib output. 2. Simply remove the $out/$lib split. Since no other derivation in nixpkgs refers to the $lib output explicitly we opt for the latter, because this is also in accordance with upstream.
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 15c8df3cb13..845593e2665 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -157,7 +157,7 @@ let done ''; - outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ]; + outputs = [ "out" ] ++ optionals buildUser [ "dev" ]; passthru = { inherit enableMail; @@ -210,9 +210,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.4"; + version = "2.1.0-rc3"; - sha256 = "sha256-ySTt0K3Lc0Le35XTwjiM5l+nIf9co7wBn+Oma1r8YHo="; + sha256 = "sha256-ARRUuyu07dWwEuXerTz9KBmclhlmsnnGucfBxxn0Zsw="; isUnstable = true; }; |