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

ghcjs: fix build

Browse Source
This commit is contained in:
Charles Strahan 2014-12-27 16:51:39 -05:00
parent a188373640
commit f36fabb389
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/haskell/ghcjs/default.nix
View File

@ -1,7 +1,7 @@
{ nodejs, cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm { nodejs, cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time
, zlib, aeson, attoparsec, bzlib, dataDefault, ghcPaths, hashable , zlib, aeson, attoparsec, bzlib, dataDefault, ghcPaths, hashable
, haskellSrcExts, haskellSrcMeta, lens, optparseApplicative_0_11_0_1 , haskellSrcExts, haskellSrcMeta, lens, optparseApplicative
, parallel, safe, shelly, split, stringsearch, syb, systemFileio , parallel, safe, shelly, split, stringsearch, syb, systemFileio
, systemFilepath, tar, terminfo, textBinary, unorderedContainers , systemFilepath, tar, terminfo, textBinary, unorderedContainers
, vector, wlPprintText, yaml, fetchgit, Cabal, CabalGhcjs, cabalInstall , vector, wlPprintText, yaml, fetchgit, Cabal, CabalGhcjs, cabalInstall
@ -51,7 +51,7 @@ in cabal.mkDerivation (self: rec {
buildDepends = [ buildDepends = [
filepath HTTP mtl network random stm time zlib aeson attoparsec filepath HTTP mtl network random stm time zlib aeson attoparsec
bzlib dataDefault ghcPaths hashable haskellSrcExts haskellSrcMeta bzlib dataDefault ghcPaths hashable haskellSrcExts haskellSrcMeta
lens optparseApplicative_0_11_0_1 parallel safe shelly split lens optparseApplicative parallel safe shelly split
stringsearch syb systemFileio systemFilepath tar terminfo textBinary stringsearch syb systemFileio systemFilepath tar terminfo textBinary
unorderedContainers vector wlPprintText yaml unorderedContainers vector wlPprintText yaml
alex happy git gnumake gcc autoconf automake libtool patch gmp alex happy git gnumake gcc autoconf automake libtool patch gmp

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

@ -236,12 +236,11 @@
}; };
packages_ghcjs = packages_ghcjs =
let parent = packages_ghc783.override { let parent = packages_ghc784.override {
extension = self: super: { extension = self: super: {
ghcjs = super.ghcjs.override { ghcjs = super.ghcjs.override {
Cabal = packages_ghc783.CabalGhcjs; Cabal = packages_ghc784.CabalGhcjs;
}; };
transformersCompat = super.transformersCompat_0_3_3_3;
network = super.network_2_6_0_2; network = super.network_2_6_0_2;
haddock = super.haddock.override { haddock = super.haddock.override {
Cabal = null; Cabal = null;
@ -338,7 +337,7 @@
tfRandom = self.callPackage ../development/libraries/haskell/tf-random {}; tfRandom = self.callPackage ../development/libraries/haskell/tf-random {};
/* /*
buildLocalCabalWithArgs = { src, name, args ? {}, cabalDrvArgs ? { jailbreak = true; }, cabal2nix ? packages_ghc783.cabal2nix }: let buildLocalCabalWithArgs = { src, name, args ? {}, cabalDrvArgs ? { jailbreak = true; }, cabal2nix ? packages_ghc784.cabal2nix }: let
cabalExpr = pkgs.stdenv.mkDerivation ({ cabalExpr = pkgs.stdenv.mkDerivation ({
name = "${name}.nix"; name = "${name}.nix";
@ -361,7 +360,7 @@
}; };
extension = self: super: { extension = self: super: {
buildLocalCabalWithArgs = args: super.buildLocalCabalWithArgs (args // { buildLocalCabalWithArgs = args: super.buildLocalCabalWithArgs (args // {
nativePkgs = packages_ghc783; nativePkgs = packages_ghc784;
}); });
}; };
}; };

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

@ -2652,10 +2652,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; transformersBase = callPackage ../development/libraries/haskell/transformers-base {};
transformersCompat_0_3_3 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.nix {}; transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {};
transformersCompat_0_3_3_3 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.3.nix {};
transformersCompat_0_3_3_4 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.4.nix {};
transformersCompat = self.transformersCompat_0_3_3_4;
transformersFree = callPackage ../development/libraries/haskell/transformers-free {}; transformersFree = callPackage ../development/libraries/haskell/transformers-free {};