git.iko.soy/typeable/nixpkgs-stackage
on master help sign in
Upd callStackage2nix does not require wrapper
4162f51Dmitry Bushev
default.nix+6−4
compare with master
unifiedsplit
@@ -9,11 +9,15 @@ let
9 else if configureFlags == null then []
9 else if configureFlags == null then []
10 else configureFlags);
10 else configureFlags);
11
11
12+ bootstrapPackages = import ./stackage2nix/stackage-packages.nix { nixpkgs = self; };
13+
12in {
14in {
13 haskell = super.haskell // {
15 haskell = super.haskell // {
14 packages = super.haskell.packages // {
16 packages = super.haskell.packages // {
15 stackage = super.callPackage ./stackage {} // {
17 stackage = super.callPackage ./stackage {} // {
16− lib = super.callPackage ./lib.nix {};
18+ lib = super.callPackage ./lib.nix {
19+ inherit (bootstrapPackages) stackage2nix;
20+ };
17 };
21 };
18 };
22 };
19 };
23 };
@@ -25,9 +29,7 @@ in {
25
29
26 stackage2nix-static = import ./stackage2nix {
30 stackage2nix-static = import ./stackage2nix {
27 drv =
31 drv =
28− let
29− stackagePackages = import ./stackage2nix/stackage-packages.nix { nixpkgs = self; };
30− in stackagePackages.stackage2nix.overrideAttrs (attrs: {
32+ bootstrapPackages.stackage2nix.overrideAttrs (attrs: {
31 enableSharedExecutables = false;
33 enableSharedExecutables = false;
32 enableSharedLibraries = false;
34 enableSharedLibraries = false;
33 configureFlags = [
35 configureFlags = [