diff options
| author | Peter Simons <simons@cryp.to> | 2014-05-17 12:17:10 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-05-17 12:56:51 +0200 |
| commit | 499f49f392aa19d61253072df383f3d2cc5de24b (patch) | |
| tree | 2b0e5c07356c2f5557f36c4b698b75158c532017 /pkgs/top-level | |
| parent | 4505378424770db5ea23a22802c581c3af004d74 (diff) | |
| download | nixlib-499f49f392aa19d61253072df383f3d2cc5de24b.tar nixlib-499f49f392aa19d61253072df383f3d2cc5de24b.tar.gz nixlib-499f49f392aa19d61253072df383f3d2cc5de24b.tar.bz2 nixlib-499f49f392aa19d61253072df383f3d2cc5de24b.tar.lz nixlib-499f49f392aa19d61253072df383f3d2cc5de24b.tar.xz nixlib-499f49f392aa19d61253072df383f3d2cc5de24b.tar.zst nixlib-499f49f392aa19d61253072df383f3d2cc5de24b.zip | |
binary: fix build with ghc 6.10.4
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 0c93774741af..5ccfeff9372a 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -79,6 +79,7 @@ ghc6104Prefs = self : super : ghc6123Prefs self super // { alex = self.alex_2_3_5.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; + binary = super.binary_0_6_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal; }; }; Cabal = self.Cabal_1_16_0_3; GLUT = self.GLUT_2_2_2_1; haddock = self.haddock_2_4_2; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3da37133dc69..48b092b783f4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -227,6 +227,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in bimap = callPackage ../development/libraries/haskell/bimap {}; + binary_0_6_1_0 = callPackage ../development/libraries/haskell/binary/0.6.1.0.nix {}; binary_0_7_2_0 = callPackage ../development/libraries/haskell/binary/0.7.2.0.nix {}; binary = null; # core package since ghc >= 7.2.x |