diff options
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 2 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e3a3b92bcbf..5f1335ca72f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -306,7 +306,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.override { hjsonpointer = self.hjsonpointer_0_2_0_4; }) (drv: { testTarget = "local"; }); + hjsonschema = overrideCabal super.hjsonschema (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; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index be659d26ee7..36e498d4be1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -45,7 +45,6 @@ extra-packages: - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock-api < 2.16 # required on GHC 7.8.x - haskell-src-exts < 1.16 # required for structured-haskell-mode-1.0.8 - - hjsonpointer == 0.2.0.4 # required for hjsonschema-0.8.0.1 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 |