nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-26 14:04:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ghcjs: don't use extension to set Cabal

Browse Source
This commit is contained in:
Charles Strahan 2014-12-27 22:09:05 -05:00
parent 94aa6539de
commit a8d78dffb0
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/haskell-defaults.nix
View File

@ -247,10 +247,6 @@
packages_ghcjs = packages_ghcjs =
let parent = packages_ghc784.override { let parent = packages_ghc784.override {
extension = self: super: { extension = self: super: {
ghcjs = super.ghcjs.override {
Cabal = packages_ghc784.Cabal_1_22_0_0;
cabalInstall = packages_ghc784.cabalInstall_1_22_0_0;
};
haddock = super.haddock.override { haddock = super.haddock.override {
Cabal = null; Cabal = null;
}; };

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

@ -938,7 +938,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
ghcid = callPackage ../development/tools/haskell/ghcid {}; ghcid = callPackage ../development/tools/haskell/ghcid {};
ghcjs = callPackage ../development/tools/haskell/ghcjs { ghcjs = callPackage ../development/tools/haskell/ghcjs {
Cabal = self.Cabal_1_18_1_3; Cabal = self.Cabal_1_22_0_0;
cabalInstall = self.cabalInstall_1_22_0_0;
}; };
ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-dom {}; ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-dom {};