From 3887308a3ad006b487f180d29b495c65294a7d26 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Tue, 17 Nov 2020 15:25:39 -0500
Subject: Update nix-shell stuff for linux

---
 Biz/Bild/Deps.nix     |  2 +-
 Biz/Bild/Overlay.nix  | 11 +++++++++--
 Biz/Bild/Rules.nix    |  2 +-
 Biz/Bild/Sources.json | 13 +++++++++++++
 4 files changed, 24 insertions(+), 4 deletions(-)

(limited to 'Biz')

diff --git a/Biz/Bild/Deps.nix b/Biz/Bild/Deps.nix
index a1e72ba..ce75805 100644
--- a/Biz/Bild/Deps.nix
+++ b/Biz/Bild/Deps.nix
@@ -5,7 +5,7 @@
   "aeson"
   "async"
   "bytestring"
-  "capability"
+  # "capability" # broken deps
   "clay"
   "cmark"
   "config-ini"
diff --git a/Biz/Bild/Overlay.nix b/Biz/Bild/Overlay.nix
index b8fe269..2fecae1 100644
--- a/Biz/Bild/Overlay.nix
+++ b/Biz/Bild/Overlay.nix
@@ -29,18 +29,23 @@ in rec
         overrides = with pkgs.pkgs.haskell.lib; self: super:
           overridePinnedDeps (simpleCabalBuilder self) // {
           acid-state = dontCheck super.acid-state; # mac: "too many open files"
+          ghcjs-base = null; # otherwise ghc tries to build this via overridePinnedDeps
           servant-auth = buildCabal self "servant-auth" "servant-auth";
+          servant-server = doJailbreak super.servant-server;
+          temporary = dontCheck super.temporary;
           wai-middleware-metrics = dontCheck super.wai-middleware-metrics;
         };
       });
-      ghcjs = pkgs.haskell.packages.ghcjs.override (old: {
+      ghcjs86 = pkgs.haskell.packages.ghcjs86.override (old: {
         overrides = with pkgs.haskell.lib; self: super:
           overridePinnedDeps (simpleCabalBuilder self) // {
           Glob = dontCheck super.Glob;
           QuickCheck = dontCheck super.QuickCheck;
-          base-compat-batteries = dontCheck super.http-types;
+          aeson = dontCheck super.aeson;
+          base-compat-batteries = dontCheck super.base-compat-batteries;
           clay = dontCheck super.clay;
           comonad = dontCheck super.comonad;
+          ghcjs-base = dontCheck (simpleCabalBuilder self "ghcjs-base");
           jsaddle-warp = dontCheck (self.callCabal2nix "jsaddle-warp" "${pkgs.sources.jsaddle}/jsaddle-warp" {});
           http-types = dontCheck super.http-types;
           network-uri= dontCheck super.network-uri;
@@ -48,7 +53,9 @@ in rec
           servant = dontCheck super.servant;
           servant-auth = buildCabal self "servant-auth" "servant-auth";
           tasty-quickcheck = dontCheck super.tasty-quickcheck;
+          temporary = dontCheck super.temporary;
           time-compat = dontCheck super.time-compat;
+          vector = dontCheck super.vector;
         };
       });
     };
diff --git a/Biz/Bild/Rules.nix b/Biz/Bild/Rules.nix
index e6a6979..e76d7a2 100644
--- a/Biz/Bild/Rules.nix
+++ b/Biz/Bild/Rules.nix
@@ -51,7 +51,7 @@ let
     ''));
 
   ghc_ = mkGhc pkgs.haskell.packages.ghc865.ghcWithHoogle;
-  ghcjs_ = mkGhc pkgs.haskell.packages.ghcjs.ghcWithPackages;
+  ghcjs_ = mkGhc pkgs.haskell.packages.ghcjs86.ghcWithPackages;
 in {
   ghc = main:
     let
diff --git a/Biz/Bild/Sources.json b/Biz/Bild/Sources.json
index da5e255..0bb1068 100644
--- a/Biz/Bild/Sources.json
+++ b/Biz/Bild/Sources.json
@@ -12,6 +12,19 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
         "version": "cc7729b1b42a79e261091ff7835f7fc2a7ae3cee"
     },
+    "ghcjs-base": {
+        "branch": "master",
+        "description": "base library for GHCJS for JavaScript interaction and marshalling, used by higher level libraries like JSC",
+        "homepage": "",
+        "owner": "ghcjs",
+        "repo": "ghcjs-base",
+        "rev": "18f31dec5d9eae1ef35ff8bbf163394942efd227",
+        "sha256": "09h3rc639n4768y75v0dbrys9pnd4da538cdgzx11dzrjm971f60",
+        "type": "tarball",
+        "url": "https://github.com/ghcjs/ghcjs-base/archive/18f31dec5d9eae1ef35ff8bbf163394942efd227.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
+        "version": "18f31dec5d9eae1ef35ff8bbf163394942efd227"
+    },
     "jsaddle": {
         "branch": "master",
         "description": "JavaScript interface that works with GHCJS or GHC",
-- 
cgit v1.2.3