git.iko.soy/typeable/nixpkgs-stackage
on master help sign in
Upd callStackage2nix does not require wrapper
commit4162f5103836bc49cdabfb20ce66d11722186e85 authorDmitry Bushev <bushevdv@gmail.com> dateFri 19 Jan 2018, 01:31 (9 years ago) parent86db371
1 file changed+6−4
default.nix+6−4
default.nix+6−4
@@ -9,11 +9,15 @@ let
99 else if configureFlags == null then []
1010 else configureFlags);
1111
12+ bootstrapPackages = import ./stackage2nix/stackage-packages.nix { nixpkgs = self; };
13+
1214in {
1315 haskell = super.haskell // {
1416 packages = super.haskell.packages // {
1517 stackage = super.callPackage ./stackage {} // {
16− lib = super.callPackage ./lib.nix {};
18+ lib = super.callPackage ./lib.nix {
19+ inherit (bootstrapPackages) stackage2nix;
20+ };
1721 };
1822 };
1923 };
@@ -25,9 +29,7 @@ in {
2529
2630 stackage2nix-static = import ./stackage2nix {
2731 drv =
28− let
29− stackagePackages = import ./stackage2nix/stackage-packages.nix { nixpkgs = self; };
30− in stackagePackages.stackage2nix.overrideAttrs (attrs: {
32+ bootstrapPackages.stackage2nix.overrideAttrs (attrs: {
3133 enableSharedExecutables = false;
3234 enableSharedLibraries = false;
3335 configureFlags = [