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/Constants.nix    |  4 ++++
 Biz/Bild/Deps.nix         |  4 ++--
 Biz/Bild/Deps/Haskell.nix |  5 +++++
 Biz/Bild/ShellHook.sh     |  3 ++-
 Biz/Bild/Sources.json     | 10 +++++-----
 5 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 Biz/Bild/Constants.nix

(limited to 'Biz/Bild')

diff --git a/Biz/Bild/Constants.nix b/Biz/Bild/Constants.nix
new file mode 100644
index 0000000..652e022
--- /dev/null
+++ b/Biz/Bild/Constants.nix
@@ -0,0 +1,4 @@
+{
+  ghcCompiler = "ghc8104";
+  ghcjsCompiler = "ghcjs86";
+}
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"
diff --git a/Biz/Bild/Deps/Haskell.nix b/Biz/Bild/Deps/Haskell.nix
index 8dfcc82..bbc8ac4 100644
--- a/Biz/Bild/Deps/Haskell.nix
+++ b/Biz/Bild/Deps/Haskell.nix
@@ -1,4 +1,9 @@
 hpkgs:
+
+# This is the global set of Haskell packages which gets deployed to Hoogle, and
+# is used to create the global 'nix-shell' environment. Eventually, bild should
+# create the environment for me.
+
 with hpkgs;
 [
   MonadRandom
diff --git a/Biz/Bild/ShellHook.sh b/Biz/Bild/ShellHook.sh
index 11954a7..d402755 100644
--- a/Biz/Bild/ShellHook.sh
+++ b/Biz/Bild/ShellHook.sh
@@ -29,7 +29,8 @@ alias tree="tree -I _ -F"
 rm -f $BIZ_ROOT/.git/hooks/{post-checkout,post-merge,pre-commit}
 ln -s $BIZ_ROOT/Biz/Ide/post-checkout $BIZ_ROOT/.git/hooks/post-checkout
 ln -s $BIZ_ROOT/Biz/Ide/post-merge $BIZ_ROOT/.git/hooks/post-merge
-ln -s $BIZ_ROOT/Biz/Lint.py $BIZ_ROOT/.git/hooks/pre-commit
+ln -s $BIZ_ROOT/Biz/Ide/pre-commit $BIZ_ROOT/.git/hooks/pre-commit
+ln -s $BIZ_ROOT/Biz/Ide/pre-push $BIZ_ROOT/.git/hooks/pre-push
 
 function deps() {
   niv --sources-file $BIZ_ROOT/Biz/Bild/Sources.json $@
diff --git a/Biz/Bild/Sources.json b/Biz/Bild/Sources.json
index f513c5d..0b2ab61 100644
--- a/Biz/Bild/Sources.json
+++ b/Biz/Bild/Sources.json
@@ -26,15 +26,15 @@
         "version": "cc7729b1b42a79e261091ff7835f7fc2a7ae3cee"
     },
     "docopt": {
-        "branch": "monad-fail",
+        "branch": "master",
         "description": "A command-line interface description language and parser that will make you smile",
         "homepage": "http://docopt.org/",
-        "owner": "gelisam",
+        "owner": "docopt",
         "repo": "docopt.hs",
-        "rev": "16dc7bc596c0ea4fa4466b12f474b1abfa72c885",
-        "sha256": "1m15zhm1b9sn7ihkxxavbgaihaybmpsrhx26pn1wyng9dh8vsp8b",
+        "rev": "cdd32227eaff46fb57330ced96d5c290cbd9e035",
+        "sha256": "1nfbm7fpmk522n58d52m44y86a7z4nm6gc3m3gc1hb3wac6vmffc",
         "type": "tarball",
-        "url": "https://github.com/gelisam/docopt.hs/archive/16dc7bc596c0ea4fa4466b12f474b1abfa72c885.tar.gz",
+        "url": "https://github.com/docopt/docopt.hs/archive/cdd32227eaff46fb57330ced96d5c290cbd9e035.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "ghc-exactprint": {
-- 
cgit v1.2.3