From 09882de5f3cbfd62d59b9ec94723a90d67555b7d Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Mon, 30 Aug 2021 20:19:13 -0400
Subject: Update to ghc 8.10.4

This also makes some changes to the build tooling to clean up the environment a
bit, and get us closer to 'bild -s'.
---
 Biz/Bild/Deps.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Biz/Bild/Deps.nix')

diff --git a/Biz/Bild/Deps.nix b/Biz/Bild/Deps.nix
index 946a834..4f16250 100644
--- a/Biz/Bild/Deps.nix
+++ b/Biz/Bild/Deps.nix
@@ -1,16 +1,16 @@
 self: super:
 
+with import ./Constants.nix;
 let
   buildCabal = sel: name:
     sel.callCabal2nix name super.sources.${name} {};
   buildCabalSubdir = sel: {name, src ? super.sources.${name}, subdir ? name}:
     sel.callCabal2nix name (src + "/${subdir}") {};
-  ghc = "ghc884";
 in rec
 {
   haskell = super.haskell // {
     packages = super.haskell.packages // {
-      "${ghc}" = super.haskell.packages."${ghc}".override (old: {
+      "${ghcCompiler}" = super.haskell.packages."${ghcCompiler}".override (old: {
         overrides = with super.pkgs.haskell.lib; sel: sup:
           super.overridePinnedDeps (buildCabal sel) // {
           acid-state = dontCheck sup.acid-state; # mac: "too many open files"
-- 
cgit v1.2.3