nix: Use GHC 8.10.4 in Nix build environment
This commit is contained in:
committed by
Remo Rechkemmer
parent
9568c4605a
commit
27c8dabd8d
+2
-2
@@ -3,7 +3,7 @@ let
|
||||
"postgrest";
|
||||
|
||||
compiler =
|
||||
"ghc884";
|
||||
"ghc8104";
|
||||
|
||||
# PostgREST source files, filtered based on the rules in the .gitignore files
|
||||
# and file extensions. We want to include as litte as possible, as the files
|
||||
@@ -109,7 +109,7 @@ rec {
|
||||
# Tooling for analyzing Haskell imports and exports.
|
||||
hsie =
|
||||
pkgs.callPackage nix/hsie {
|
||||
ghcWithPackages = pkgs.haskell.packages."${compiler}".ghcWithPackages;
|
||||
ghcWithPackages = pkgs.haskell.packages.ghc884.ghcWithPackages;
|
||||
};
|
||||
|
||||
### Tools
|
||||
|
||||
@@ -46,15 +46,9 @@ let
|
||||
normalPkgs =
|
||||
import patchedNixpkgs { inherit overlays; };
|
||||
|
||||
# Each version of GHC needs a specific version of Cabal.
|
||||
defaultCabalPackageVersionComingWithGhc =
|
||||
{
|
||||
ghc884 = "Cabal_3_2_1_0";
|
||||
}."${compiler}";
|
||||
|
||||
# The static-haskell-nix 'survey' derives a full static set of Haskell
|
||||
# packages, applying fixes where necessary.
|
||||
survey =
|
||||
import "${patched-static-haskell-nix}/survey" { inherit normalPkgs compiler defaultCabalPackageVersionComingWithGhc; };
|
||||
import "${patched-static-haskell-nix}/survey" { inherit normalPkgs compiler; };
|
||||
in
|
||||
survey.haskellPackages."${name}"
|
||||
|
||||
Reference in New Issue
Block a user