diff options
| author | Peter Simons <simons@cryp.to> | 2016-01-26 14:01:40 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-01-26 14:01:40 +0100 |
| commit | 62900b026b30f1639a676cb12f046f955073d49b (patch) | |
| tree | e84a5e7d83cee0742936f99d4cdc59ee4320318f /pkgs | |
| parent | 4e309951ee4d0e70a1f88e3934474b192dc64f56 (diff) | |
| download | nixlib-62900b026b30f1639a676cb12f046f955073d49b.tar nixlib-62900b026b30f1639a676cb12f046f955073d49b.tar.gz nixlib-62900b026b30f1639a676cb12f046f955073d49b.tar.bz2 nixlib-62900b026b30f1639a676cb12f046f955073d49b.tar.lz nixlib-62900b026b30f1639a676cb12f046f955073d49b.tar.xz nixlib-62900b026b30f1639a676cb12f046f955073d49b.tar.zst nixlib-62900b026b30f1639a676cb12f046f955073d49b.zip | |
haskell-nats: fix overrides for GHC versions prior to 7.10.x.
Closes https://github.com/NixOS/nixpkgs/issues/12622.
Diffstat (limited to 'pkgs')
6 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 6d4e7a7bb256..322d7ea30937 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -89,6 +89,7 @@ self: super: { split = super.split_0_1_4_3; # Needs hashable on pre 7.10.x compilers. + nats_1 = addBuildDepend super.nats_1 self.hashable; nats = addBuildDepend super.nats self.hashable; # Needs void on pre 7.10.x compilers. diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index cc5d03f05f5b..6147be8f0f4b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -68,6 +68,7 @@ self: super: { doctest = dontHaddock super.doctest; # Needs hashable on pre 7.10.x compilers. + nats_1 = addBuildDepend super.nats_1 self.hashable; nats = addBuildDepend super.nats self.hashable; # Newer versions require bytestring >=0.10. diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 51962f161fc0..63aab9e45677 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -69,6 +69,7 @@ self: super: { doctest = dontHaddock super.doctest; # Needs hashable on pre 7.10.x compilers. + nats_1 = addBuildDepend super.nats_1 self.hashable; nats = addBuildDepend super.nats self.hashable; # Newer versions require bytestring >=0.10. diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index f1774c04a8fc..da7008b63f15 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -74,6 +74,7 @@ self: super: { control-monad-free = super.control-monad-free_0_5_3; # Needs hashable on pre 7.10.x compilers. + nats_1 = addBuildDepend super.nats_1 self.hashable; nats = addBuildDepend super.nats self.hashable; # Test suite won't compile. diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index f89ffc4c7c12..5c0d09127b9d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -77,6 +77,7 @@ self: super: { control-monad-free = super.control-monad-free_0_5_3; # Needs hashable on pre 7.10.x compilers. + nats_1 = addBuildDepend super.nats_1 self.hashable; nats = addBuildDepend super.nats self.hashable; # https://github.com/magthe/sandi/issues/7 diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 81c060a4c3ec..81379ce9c371 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -112,6 +112,7 @@ self: super: { self.webkitgtk3-javascriptcore ]; # Needs hashable on pre 7.10.x compilers. + nats_1 = addBuildDepend super.nats_1 self.hashable; nats = addBuildDepend super.nats self.hashable; # needs mtl-compat to build with mtl 2.1.x |