public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23610 from ljli/hs-ghcjs-pkgs-inherit

Browse Source 
haskellPackages: apply GHC specific overrides before GHCJS
This commit is contained in:
Peter Simons 2017-03-24 23:15:41 +01:00 committed by GitHub
commit 24a69286e9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-ghcjs.nix
View File

@ -181,8 +181,6 @@ self: super:
] drv.libraryHaskellDepends; ] drv.libraryHaskellDepends;
}); });
semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ];
transformers-compat = overrideCabal super.transformers-compat (drv: { transformers-compat = overrideCabal super.transformers-compat (drv: {
configureFlags = []; configureFlags = [];
}); });

6
pkgs/top-level/haskell-packages.nix
View File

@ -166,11 +166,13 @@ in rec {
}; };
ghcjs = callPackage ../development/haskell-modules { ghcjs = callPackage ../development/haskell-modules {
ghc = compiler.ghcjs; ghc = compiler.ghcjs;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
}; };
ghcjsHEAD = callPackage ../development/haskell-modules { ghcjsHEAD = callPackage ../development/haskell-modules {
ghc = compiler.ghcjsHEAD; ghc = compiler.ghcjsHEAD;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
}; };
ghcHaLVM240 = callPackage ../development/haskell-modules { ghcHaLVM240 = callPackage ../development/haskell-modules {
ghc = compiler.ghcHaLVM240; ghc = compiler.ghcHaLVM240;