diff options
Diffstat (limited to 'nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix')
-rw-r--r-- | nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index ff1c01aa8e87..ba885c0ecd5f 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -283,11 +283,11 @@ self: super: builtins.intersectAttrs super { caramia = dontCheck super.caramia; llvm-hs = - let llvmHsWithLlvm8 = super.llvm-hs.override { llvm-config = pkgs.llvm_8; }; + let llvmHsWithLlvm9 = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; in if pkgs.stdenv.isDarwin then - overrideCabal llvmHsWithLlvm8 (oldAttrs: { + overrideCabal llvmHsWithLlvm9 (oldAttrs: { # One test fails on darwin. doCheck = false; # llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to @@ -298,7 +298,7 @@ self: super: builtins.intersectAttrs super { substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()" ''; }) - else llvmHsWithLlvm8; + else llvmHsWithLlvm9; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; @@ -572,17 +572,19 @@ self: super: builtins.intersectAttrs super { # The test-suite requires a running PostgreSQL server. Frames-beam = dontCheck super.Frames-beam; - futhark = if pkgs.stdenv.isDarwin then super.futhark else with pkgs; - let path = stdenv.lib.makeBinPath [ gcc ]; - in overrideCabal (addBuildTool super.futhark makeWrapper) (_drv: { - postInstall = '' - wrapProgram $out/bin/futhark \ - --prefix PATH : "${path}" \ - --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \ - --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \ - --set NIX_CFLAGS_LINK "-L${ocl-icd}/lib" - ''; - }); + # Compile manpages (which are in RST and are compiled with Sphinx). + futhark = with pkgs; + overrideCabal (addBuildTools super.futhark [makeWrapper python37Packages.sphinx]) + (_drv: { + postBuild = (_drv.postBuild or "") + '' + make -C docs man + ''; + + postInstall = (_drv.postInstall or "") + '' + mkdir -p $out/share/man/man1 + mv docs/_build/man/*.1 $out/share/man/man1/ + ''; + }); git-annex = with pkgs; if (!stdenv.isLinux) then @@ -638,22 +640,19 @@ self: super: builtins.intersectAttrs super { spago = let - # Spago needs a patch for MonadFail changes. - # https://github.com/purescript/spago/pull/584 - # This can probably be removed when a version after spago-0.14.0 is released. + # Spago needs a small patch to work with the latest versions of rio. + # https://github.com/purescript/spago/pull/616 + # This can probably be removed when a version after spago-0.15.1 is released. spagoWithPatches = appendPatch super.spago (pkgs.fetchpatch { - url = "https://github.com/purescript/spago/pull/584/commits/898a8e48665e5a73ea03525ce2c973455ab9ac52.patch"; - sha256 = "05gs1hjlcf60cr6728rhgwwgxp3ildly14v4l2lrh6ma2fljhyjy"; + url = "https://github.com/purescript/spago/pull/616/commits/95b5fa0f1d3bfb07972d1ef5004b8bee8a070667.patch"; + sha256 = "0v3890lwhddfrq9mhbq92962pkxra8kwbin97wg3s0b02dk65ysc"; }); # Spago basically compiles with LTS-14, but it requires a newer version # of directory. This is to work around a bug only present on windows, so # we can safely jailbreak spago and use the older directory package from # LTS-14. - spagoWithOverrides = doJailbreak (spagoWithPatches.override { - # spago requires dhall-1.29.0. - dhall = self.dhall_1_29_0; - }); + spagoWithOverrides = doJailbreak spagoWithPatches; # 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. @@ -725,4 +724,13 @@ self: super: builtins.intersectAttrs super { # dhall_1_29_0 is no longer used, since more recent versions of dhall don't # access the network in checks. dhall_1_29_0 = dontCheck super.dhall_1_29_0; + + cut-the-crap = + let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg ]; + in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { + postInstall = '' + wrapProgram $out/bin/cut-the-crap \ + --prefix PATH : "${path}" + ''; + }); } |