From 664bbed4122ecd931d73ee12bde2c9001f7fe67c Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 27 Jul 2017 21:11:15 +0200 Subject: [PATCH] all-packages.nix: Fix evaluation error for zfs Regression introduced by 2799a94963aaf37f059b5ed4c0d2b0cf98ba445e. 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 Cc: @globin --- pkgs/top-level/all-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a65f39cb8bcc..8d4e407dde73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12796,11 +12796,9 @@ with pkgs; zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { }; - inherit (callPackage ../os-specific/linux/zfs { + zfs = callPackage ../os-specific/linux/zfs { configFile = "user"; - }) zfsStable zfsUnstable; - - zfs = zfsStable; + }; ### DATA