From 27c8dabd8ddaeba78686690cc34fea503ae604bc Mon Sep 17 00:00:00 2001
From: monacoremo <59358383+monacoremo@users.noreply.github.com>
Date: Wed, 14 Jul 2021 10:13:20 +0200
Subject: [PATCH] nix: Use GHC 8.10.4 in Nix build environment

---
 default.nix                    | 4 ++--
 nix/static-haskell-package.nix | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/default.nix b/default.nix
index 1ea7b9af9..fe13dd5ca 100644
--- a/default.nix
+++ b/default.nix
@@ -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
diff --git a/nix/static-haskell-package.nix b/nix/static-haskell-package.nix
index 98afd4d43..32a61cafa 100644
--- a/nix/static-haskell-package.nix
+++ b/nix/static-haskell-package.nix
@@ -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}"