Skip to content

Commit 664bbed

Browse files
committedJul 27, 2017
all-packages.nix: Fix evaluation error for zfs
Regression introduced by 2799a94. Attribute zfsStable and zfsUnstable are now gone for the package expression itself. The mentioned commit however only changed the reference in all-packages.nix for the kernel module, but not the userland package. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @globin
1 parent 63d7b6e commit 664bbed

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed
 

‎pkgs/top-level/all-packages.nix

+2-4
Original file line numberDiff line numberDiff line change
@@ -12796,11 +12796,9 @@ with pkgs;
1279612796

1279712797
zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { };
1279812798

12799-
inherit (callPackage ../os-specific/linux/zfs {
12799+
zfs = callPackage ../os-specific/linux/zfs {
1280012800
configFile = "user";
12801-
}) zfsStable zfsUnstable;
12802-
12803-
zfs = zfsStable;
12801+
};
1280412802

1280512803
### DATA
1280612804

3 commit comments

Comments
 (3)

globin commented on Jul 28, 2017

@globin
Member

Sorry for missing that one and thanks for fixing..

FRidh commented on Jul 28, 2017

@FRidh
Member

@globin could you merge master into staging? There's a ZFS conflict.

fpletz commented on Jul 28, 2017

@fpletz
Member

Done: b116fa5

Please sign in to comment.