diff options
| author | Peter Simons <simons@cryp.to> | 2020-10-16 21:31:53 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-10-16 21:31:53 +0200 |
| commit | ee44940ee5c0f3d50e096ab00ae5d0064e098558 (patch) | |
| tree | e7013e44d195cd8a51b9ecc1fa1b597169514f8e | |
| parent | 84022e0b1508f506a52671134032a8db111eb696 (diff) | |
| download | nixpkgs-ee44940ee5c0f3d50e096ab00ae5d0064e098558.tar nixpkgs-ee44940ee5c0f3d50e096ab00ae5d0064e098558.tar.gz nixpkgs-ee44940ee5c0f3d50e096ab00ae5d0064e098558.tar.bz2 nixpkgs-ee44940ee5c0f3d50e096ab00ae5d0064e098558.tar.lz nixpkgs-ee44940ee5c0f3d50e096ab00ae5d0064e098558.tar.xz nixpkgs-ee44940ee5c0f3d50e096ab00ae5d0064e098558.tar.zst nixpkgs-ee44940ee5c0f3d50e096ab00ae5d0064e098558.zip | |
stack: override pantry to the latest version to fix the build
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 79e0c1e220a..43753f147de 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1478,6 +1478,10 @@ self: super: { domain-auth = dontCheck super.domain-auth; # INSERT NEW OVERRIDES ABOVE THIS LINE + # stack-2.5.1 needs a more current version of pantry to compile + pantry = self.pantry_0_5_1_3; + + # haskell-language-server needs a more current version of pantry to compile } // (let inherit (self) hls-ghcide hls-brittany; hlsScopeOverride = self: super: { diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 68fb1165702..2158386629a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -645,6 +645,7 @@ self: super: builtins.intersectAttrs super { # Tests require internet http-download = dontCheck super.http-download; pantry = dontCheck super.pantry; + pantry_0_5_1_3 = dontCheck super.pantry_0_5_1_3; # gtk2hs-buildtools is listed in setupHaskellDepends, but we # need it during the build itself, too. |