diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2014-12-27 16:51:39 -0500 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2014-12-27 16:51:39 -0500 |
| commit | f36fabb389ed9eec6911f341859a8ddab9e9de88 (patch) | |
| tree | af1af975c492ba89262fe7be227782a68d3f70a1 /pkgs | |
| parent | a188373640738d81cfb18a3f7330ac23e99443cc (diff) | |
| download | nixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.tar nixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.tar.gz nixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.tar.bz2 nixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.tar.lz nixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.tar.xz nixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.tar.zst nixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.zip | |
ghcjs: fix build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/haskell/ghcjs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 5 |
3 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/development/tools/haskell/ghcjs/default.nix b/pkgs/development/tools/haskell/ghcjs/default.nix index 9cd2080f0c9b..0df3aecebc3b 100644 --- a/pkgs/development/tools/haskell/ghcjs/default.nix +++ b/pkgs/development/tools/haskell/ghcjs/default.nix @@ -1,7 +1,7 @@ { nodejs, cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time , 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 , systemFilepath, tar, terminfo, textBinary, unorderedContainers , vector, wlPprintText, yaml, fetchgit, Cabal, CabalGhcjs, cabalInstall @@ -51,7 +51,7 @@ in cabal.mkDerivation (self: rec { buildDepends = [ filepath HTTP mtl network random stm time zlib aeson attoparsec 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 unorderedContainers vector wlPprintText yaml alex happy git gnumake gcc autoconf automake libtool patch gmp diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 9d8177d49b8b..95520ee94af4 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -236,12 +236,11 @@ }; packages_ghcjs = - let parent = packages_ghc783.override { + let parent = packages_ghc784.override { extension = self: super: { 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; haddock = super.haddock.override { Cabal = null; @@ -338,7 +337,7 @@ 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 ({ name = "${name}.nix"; @@ -361,7 +360,7 @@ }; extension = self: super: { buildLocalCabalWithArgs = args: super.buildLocalCabalWithArgs (args // { - nativePkgs = packages_ghc783; + nativePkgs = packages_ghc784; }); }; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 1d640875212a..abfa8f931ca6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2652,10 +2652,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; - transformersCompat_0_3_3 = callPackage ../development/libraries/haskell/transformers-compat/0.3.3.nix {}; - 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; + transformersCompat = callPackage ../development/libraries/haskell/transformers-compat {}; transformersFree = callPackage ../development/libraries/haskell/transformers-free {}; |