diff options
Diffstat (limited to 'nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix | 56 |
1 files changed, 40 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index cecd27e023da..8b40842fd0d7 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -114,6 +114,7 @@ self: super: builtins.intersectAttrs super { })) super) hls-brittany-plugin + hls-stan-plugin hls-floskell-plugin hls-fourmolu-plugin hls-overloaded-record-dot-plugin @@ -328,6 +329,11 @@ self: super: builtins.intersectAttrs super { # Heist's test suite requires system pandoc heist = addTestToolDepend pkgs.pandoc super.heist; + # Use Nixpkgs' double-conversion library + double-conversion = disableCabalFlag "embedded_double_conversion" ( + addBuildDepends [ pkgs.double-conversion ] super.double-conversion + ); + # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 gio = lib.pipe super.gio [ (disableHardening ["fortify"]) @@ -422,7 +428,7 @@ self: super: builtins.intersectAttrs super { hasql-interpolate = dontCheck super.hasql-interpolate; hasql-notifications = dontCheck super.hasql-notifications; hasql-pool = dontCheck super.hasql-pool; - hasql-pool_0_10 = dontCheck super.hasql-pool_0_10; + hasql-pool_0_10_0_1 = doDistribute (dontCheck super.hasql-pool_0_10_0_1); hasql-transaction = dontCheck super.hasql-transaction; # Test suite requires a running postgresql server, @@ -447,9 +453,8 @@ self: super: builtins.intersectAttrs super { mime-mail = appendConfigureFlag "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\"" super.mime-mail; # Help the test suite find system timezone data. - tz = overrideCabal (drv: { - preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; - }) super.tz; + tz = addBuildDepends [ pkgs.tzdata ] super.tz; + tzdata = addBuildDepends [ pkgs.tzdata ] super.tzdata; # https://hydra.nixos.org/build/128665302/nixlog/3 # Disable tests because they require a running dbus session @@ -490,6 +495,17 @@ self: super: builtins.intersectAttrs super { # requires llvm 9 specifically https://github.com/llvm-hs/llvm-hs/#building-from-source llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; + # llvm-ffi needs a specific version of LLVM which we hard code here. Since we + # can't use pkg-config (LLVM has no official .pc files), we need to pass the + # `dev` and `lib` output in, or Cabal will have trouble finding the library. + # Since it looks a bit neater having it in a list, we circumvent the singular + # LLVM input here. + llvm-ffi = + addBuildDepends [ + pkgs.llvmPackages_16.llvm.lib + pkgs.llvmPackages_16.llvm.dev + ] (super.llvm-ffi.override { LLVM = null; }); + # Needs help finding LLVM. spaceprobe = addBuildTool self.buildHaskellPackages.llvmPackages.llvm super.spaceprobe; @@ -814,8 +830,9 @@ self: super: builtins.intersectAttrs super { # Tests require internet http-download = dontCheck super.http-download; + http-download_0_2_1_0 = doDistribute (dontCheck super.http-download_0_2_1_0); pantry = dontCheck super.pantry; - pantry_0_5_2_1 = dontCheck super.pantry_0_5_2_1; + pantry_0_9_3_1 = dontCheck super.pantry_0_9_3_1; # gtk2hs-buildtools is listed in setupHaskellDepends, but we # need it during the build itself, too. @@ -1199,18 +1216,25 @@ self: super: builtins.intersectAttrs super { }) super.procex; # Test suite wants to run main executable - fourmolu = overrideCabal (drv: { - preCheck = drv.preCheck or "" + '' - export PATH="$PWD/dist/build/fourmolu:$PATH" - ''; - }) super.fourmolu; + # https://github.com/fourmolu/fourmolu/issues/231 + inherit ( + let + fourmoluTestFix = overrideCabal (drv: { + preCheck = drv.preCheck or "" + '' + export PATH="$PWD/dist/build/fourmolu:$PATH" + ''; + }); + in - # Test suite wants to run main executable - fourmolu_0_10_1_0 = overrideCabal (drv: { - preCheck = drv.preCheck or "" + '' - export PATH="$PWD/dist/build/fourmolu:$PATH" - ''; - }) super.fourmolu_0_10_1_0; + { + fourmolu = fourmoluTestFix super.fourmolu; + fourmolu_0_14_0_0 = fourmoluTestFix super.fourmolu_0_14_0_0; + fourmolu_0_14_1_0 = fourmoluTestFix super.fourmolu_0_14_1_0; + }) + fourmolu + fourmolu_0_14_0_0 + fourmolu_0_14_1_0 + ; # Test suite needs to execute 'disco' binary disco = overrideCabal (drv: { |