diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-28 16:32:57 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-28 16:32:57 +0000 |
| commit | 3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4 (patch) | |
| tree | 04c567a4061b3adf6d1e0a898f39b67f27d37aea /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | 8615f026a48cbf3f1c37b30e9b70bba6af013a12 (diff) | |
| parent | a9d24cedeb3ba97a4e23ff93fadff32280ff0ab6 (diff) | |
| download | nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.gz nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.bz2 nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.lz nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.xz nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.tar.zst nixlib-3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3b45bbc93b2e..a307041e0c87 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -35,9 +35,6 @@ self: super: { hspec-expectations = dontCheck super.hspec-expectations; hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; }; HTTP = dontCheck super.HTTP; - mwc-random_0_13_2_2 = dontCheck super.mwc-random_0_13_2_2; - mwc-random_0_13_3_0 = dontCheck super.mwc-random_0_13_3_0; - mwc-random = dontCheck super.mwc-random; nanospec_0_2_0 = dontCheck super.nanospec_0_2_0; nanospec = dontCheck super.nanospec; options_1_2_1 = dontCheck super.options_1_2_1; @@ -330,7 +327,7 @@ self: super: { github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw - hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); + hjsonschema = overrideCabal (super.hjsonschema.override { hjsonpointer = pkgs.hjsonpointer_0_2_0_4; }) (drv: { testTarget = "local"; }); hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; }); marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw network-transport-tcp = dontCheck super.network-transport-tcp; |