diff options
| author | Nicholas Clarke <nick@topos.org.uk> | 2017-08-24 17:21:08 +0100 |
|---|---|---|
| committer | Nicholas Clarke <nick@topos.org.uk> | 2017-09-04 12:35:58 +0100 |
| commit | eb99d3a670957765e4ade5c2b3086c813b07e1ca (patch) | |
| tree | dd4635f66f5e78c62a43211961bde29593eee20b /pkgs/development/haskell-modules | |
| parent | be90e9aa311027be249a4faade59eda265b2043d (diff) | |
| download | nixlib-eb99d3a670957765e4ade5c2b3086c813b07e1ca.tar nixlib-eb99d3a670957765e4ade5c2b3086c813b07e1ca.tar.gz nixlib-eb99d3a670957765e4ade5c2b3086c813b07e1ca.tar.bz2 nixlib-eb99d3a670957765e4ade5c2b3086c813b07e1ca.tar.lz nixlib-eb99d3a670957765e4ade5c2b3086c813b07e1ca.tar.xz nixlib-eb99d3a670957765e4ade5c2b3086c813b07e1ca.tar.zst nixlib-eb99d3a670957765e4ade5c2b3086c813b07e1ca.zip | |
Fix git-annex.
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c97a586d1eae..c1813cad7a9e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -499,7 +499,6 @@ self: super: builtins.intersectAttrs super { # Disable separate bin outputs for these specific packages that break with it. H = hasNoBinOutput super.H; cryptol = hasNoBinOutput super.cryptol; - git-annex = hasNoBinOutput super.git-annex; sproxy = hasNoBinOutput super.sproxy; sproxy2 = hasNoBinOutput super.sproxy2; sproxy-web = hasNoBinOutput super.sproxy-web; @@ -508,6 +507,11 @@ self: super: builtins.intersectAttrs super { sugarhaskell = hasNoBinOutput super.sugarhaskell; zerobin = hasNoBinOutput super.zerobin; + git-annex = overrideCabal super.git-annex (drv: { + enableSeparateBinOutput = false; + enableSeparateEtcOutput = false; + }); + # Override a number of packages with specific references to $out in their # derivations stack = overrideCabal super.stack (drv: { |