diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-nix.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 472e4c66fc7..6886a35c0a8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -592,12 +592,19 @@ self: super: builtins.intersectAttrs super { ''; }); - # On Darwin, git-annex mis-detects options to `cp`, so we wrap the binary to - # ensure it uses Nixpkgs' coreutils. git-annex = with pkgs; if (!stdenv.isLinux) then let path = stdenv.lib.makeBinPath [ coreutils ]; in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: { + # This is an instance of https://github.com/NixOS/nix/pull/1085 + # Fails with: + # gpg: can't connect to the agent: File name too long + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Test.hs \ + --replace ', testCase "crypto" test_crypto' "" + ''; + # On Darwin, git-annex mis-detects options to `cp`, so we wrap the + # binary to ensure it uses Nixpkgs' coreutils. postFixup = '' wrapProgram $out/bin/git-annex \ --prefix PATH : "${path}" @@ -644,8 +651,8 @@ self: super: builtins.intersectAttrs super { # we can safely jailbreak spago and use the older directory package from # LTS-14. spagoWithOverrides = doJailbreak (super.spago.override { - # spago requires the latest version of dhall. - directory = self.dhall_1_28_0; + # spago requires dhall_1_27_0. + dhall = self.dhall_1_27_0; }); docsSearchAppJsFile = pkgs.fetchurl { @@ -683,13 +690,9 @@ self: super: builtins.intersectAttrs super { ''; }); - # Haddock generation is broken for spago. - # https://github.com/spacchetti/spago/issues/511 - spagoWithoutHaddocks = dontHaddock spagoFixHpack; - # Because of the problem above with pulling in hspec defaults to the # package.yaml file, the tests are disabled. - spagoWithoutChecks = dontCheck spagoWithoutHaddocks; + spagoWithoutChecks = dontCheck spagoFixHpack; in spagoWithoutChecks; } |