public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configuration-common.nix: fix build tools

Browse Source
This commit is contained in:
Domen Kožar 2018-07-02 22:11:17 +01:00 committed by Matthew Bauer
parent 1a668f79b2
commit 9ed54a38bd
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -341,7 +341,7 @@ self: super: {
hsbencher = dontCheck super.hsbencher; hsbencher = dontCheck super.hsbencher;
hsexif = dontCheck super.hsexif; hsexif = dontCheck super.hsexif;
hspec-server = dontCheck super.hspec-server; 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 = dontCheck super.htsn;
htsn-import = dontCheck super.htsn-import; htsn-import = dontCheck super.htsn-import;
http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105 http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105

7
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -517,14 +517,11 @@ self: super: builtins.intersectAttrs super {
blank-canvas = dontCheck super.blank-canvas; blank-canvas = dontCheck super.blank-canvas;
blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2; 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 # Custom setup needs pg_config
HDBC-postgresql = addBuildTool super.HDBC-postgresql pkgs.postgresql; HDBC-postgresql = addBuildTool super.HDBC-postgresql pkgs.postgresql;
# Custom setup needs sdl-config # Custom setup needs sdl-config
SDL = addBuildTool super.SDL pkgs.SDL; SDL = addBuildTool super.SDL pkgs.SDL;
neat-interpolation = addBuildTool super.neat-interpolation self.HTF;
hnix = addBuildTool super.hnix pkgs.nix;
} }