diff options
| author | Domen Kožar <domen@dev.si> | 2018-06-30 15:49:36 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2018-06-30 15:49:36 +0100 |
| commit | 5974bb7c9c6a6fd4968516ebc6efa5370323fc8d (patch) | |
| tree | 74f8a7b226020a9d8c81446592c768a22b20ccab /pkgs/development | |
| parent | dd608f80dbbfd39e072b11174fad0e3751e2d388 (diff) | |
| download | nixlib-5974bb7c9c6a6fd4968516ebc6efa5370323fc8d.tar nixlib-5974bb7c9c6a6fd4968516ebc6efa5370323fc8d.tar.gz nixlib-5974bb7c9c6a6fd4968516ebc6efa5370323fc8d.tar.bz2 nixlib-5974bb7c9c6a6fd4968516ebc6efa5370323fc8d.tar.lz nixlib-5974bb7c9c6a6fd4968516ebc6efa5370323fc8d.tar.xz nixlib-5974bb7c9c6a6fd4968516ebc6efa5370323fc8d.tar.zst nixlib-5974bb7c9c6a6fd4968516ebc6efa5370323fc8d.zip | |
haskell: Move version dependent overrides from to configuration-common
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6cc6945bae4d..f4f91e829336 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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; + }; + } // diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a9f21040ac0c..54366046222d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -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; - }; } |