diff options
| author | Domen Kožar <domen@dev.si> | 2018-07-02 22:11:17 +0100 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-03 19:24:40 -0400 |
| commit | 9ed54a38bd9f2c60c18ef30857dbb9f220ced9f6 (patch) | |
| tree | c875c9a56e7ecd74e9963810d82870373e7dfa9f /pkgs/development/haskell-modules | |
| parent | 1a668f79b277f7e7d3a4bae93cc1234ce3b25a4b (diff) | |
| download | nixlib-9ed54a38bd9f2c60c18ef30857dbb9f220ced9f6.tar nixlib-9ed54a38bd9f2c60c18ef30857dbb9f220ced9f6.tar.gz nixlib-9ed54a38bd9f2c60c18ef30857dbb9f220ced9f6.tar.bz2 nixlib-9ed54a38bd9f2c60c18ef30857dbb9f220ced9f6.tar.lz nixlib-9ed54a38bd9f2c60c18ef30857dbb9f220ced9f6.tar.xz nixlib-9ed54a38bd9f2c60c18ef30857dbb9f220ced9f6.tar.zst nixlib-9ed54a38bd9f2c60c18ef30857dbb9f220ced9f6.zip | |
configuration-common.nix: fix build tools
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7c4330d74168..e7c7f0a37630 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -341,7 +341,7 @@ self: super: { hsbencher = dontCheck super.hsbencher; hsexif = dontCheck super.hsexif; hspec-server = dontCheck super.hspec-server; - HTF = addTestToolDepend (dontCheck super.HTF) self.cpphs; + HTF = addBuildTool (dontCheck super.HTF) self.cpphs; htsn = dontCheck super.htsn; htsn-import = dontCheck super.htsn-import; http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 769033e7df9e..07be62984532 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -517,14 +517,11 @@ self: super: builtins.intersectAttrs super { blank-canvas = dontCheck super.blank-canvas; blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2; - # cabal2nix generates a dependency on base-compat, which is the wrong version - base-compat-batteries = super.base-compat-batteries.override { - base-compat = super.base-compat_0_10_1; - }; - # Custom setup needs pg_config HDBC-postgresql = addBuildTool super.HDBC-postgresql pkgs.postgresql; # Custom setup needs sdl-config SDL = addBuildTool super.SDL pkgs.SDL; + neat-interpolation = addBuildTool super.neat-interpolation self.HTF; + hnix = addBuildTool super.hnix pkgs.nix; } |