diff options
Diffstat (limited to 'nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix')
-rw-r--r-- | nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 9be625683732..9cc048125172 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -95,7 +95,15 @@ self: super: builtins.intersectAttrs super { sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; # profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8 - cachix = disableLibraryProfiling super.cachix; + cachix = overrideSrc (disableLibraryProfiling super.cachix) { + src = (pkgs.fetchFromGitHub { + owner = "cachix"; + repo = "cachix"; + rev = "1471050f5906ecb7cd0d72115503d07d2e3beb17"; + sha256 = "1lkrmhv5x9dpy53w33kxnhv4x4qm711ha8hsgccrjmxaqcsdm59g"; + }) + "/cachix"; + version = "0.5.1"; + }; hercules-ci-agent = disableLibraryProfiling super.hercules-ci-agent; # avoid compiling twice by providing executable as a separate output (with small closure size) @@ -653,16 +661,9 @@ self: super: builtins.intersectAttrs super { spago = let - # Spago needs a small patch to work with the latest versions of rio. - # https://github.com/purescript/spago/pull/647 - spagoWithPatches = appendPatch super.spago (pkgs.fetchpatch { - url = "https://github.com/purescript/spago/pull/647/commits/917ee541a966db74f0f5d11f2f86df0030c35dd7.patch"; - sha256 = "1nspqgcjk6z90cl9zhard0rn2q979kplcqz72x8xv5mh57zabk0w"; - }); - # spago requires an older version of megaparsec, but it appears to work # fine with newer versions. - spagoWithOverrides = doJailbreak spagoWithPatches; + spagoWithOverrides = doJailbreak super.spago; # This defines the version of the purescript-docs-search release we are using. # This is defined in the src/Spago/Prelude.hs file in the spago source. @@ -729,9 +730,10 @@ self: super: builtins.intersectAttrs super { # break infinite recursion with base-orphans primitive = dontCheck super.primitive; + primitive_0_7_1_0 = dontCheck super.primitive_0_7_1_0; cut-the-crap = - let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 ]; + let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg_3 pkgs.youtube-dl ]; in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { postInstall = '' wrapProgram $out/bin/cut-the-crap \ @@ -782,6 +784,11 @@ self: super: builtins.intersectAttrs super { testToolDepends = [ pkgs.git pkgs.mercurial ]; }); + nix-output-monitor = overrideCabal super.nix-output-monitor { + # Can't ran the golden-tests with nix, because they call nix + testTarget = "unit-tests"; + }; + haskell-language-server = overrideCabal super.haskell-language-server (drv: { postInstall = let inherit (pkgs.lib) concatStringsSep take splitString; @@ -791,5 +798,14 @@ self: super: builtins.intersectAttrs super { ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_version} ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${ghc_major_version} ''; + testToolDepends = [ self.cabal-install pkgs.git ]; + testTarget = "func-test"; # wrapper test accesses internet + preCheck = '' + export PATH=$PATH:$PWD/dist/build/haskell-language-server:$PWD/dist/build/haskell-language-server-wrapper + export HOME=$TMPDIR + ''; }); + + # tests depend on a specific version of solc + hevm = dontCheck (doJailbreak super.hevm); } |