From 9ed54a38bd9f2c60c18ef30857dbb9f220ced9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 2 Jul 2018 22:11:17 +0100 Subject: [PATCH] configuration-common.nix: fix build tools --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 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 7c4330d7416..e7c7f0a3763 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 769033e7df9..07be6298453 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; }