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

haskell: Move version dependent overrides from to configuration-common

Browse Source
This commit is contained in:
Domen Kožar 2018-06-30 15:49:36 +01:00
parent dd608f80db
commit 5974bb7c9c
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1068,6 +1068,11 @@ self: super: {
# https://github.com/fpco/streaming-commons/issues/49
streaming-commons = dontCheck super.streaming-commons;
# 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;
};
}
//

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

@ -516,9 +516,4 @@ self: super: builtins.intersectAttrs super {
# Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
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;
};
}