Haskell packages don't mix default.nix and <version>.nix in the same directory

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2014-02-03 18:56:27 -05:00
parent 5ac4f3dcf6
commit bd996abc9c
3 changed files with 2 additions and 2 deletions

View File

@ -1572,14 +1572,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
llvmGeneralPure = self.llvmGeneralPure_3_3; llvmGeneralPure = self.llvmGeneralPure_3_3;
}; };
llvmGeneral = callPackage ../development/libraries/haskell/llvm-general { llvmGeneral = callPackage ../development/libraries/haskell/llvm-general/3.4.nix {
llvmConfig = pkgs.llvm; llvmConfig = pkgs.llvm;
inherit (pkgs) zlib ncurses; inherit (pkgs) zlib ncurses;
}; };
llvmGeneralPure_3_3 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.nix { }; llvmGeneralPure_3_3 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.nix { };
llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure {}; llvmGeneralPure = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.nix {};
lrucache = callPackage ../development/libraries/haskell/lrucache {}; lrucache = callPackage ../development/libraries/haskell/lrucache {};