summaryrefslogtreecommitdiff
path: root/Biz/Bild/Overlay.nix
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2020-11-17 15:25:39 -0500
committerBen Sima <ben@bsima.me>2020-11-17 15:25:39 -0500
commit3887308a3ad006b487f180d29b495c65294a7d26 (patch)
tree2d8fbf874e81f740c944f553b83e44070b477f14 /Biz/Bild/Overlay.nix
parentb1468fd5630a01966c9c3243de6c7882c3c95b7a (diff)
Update nix-shell stuff for linux
Diffstat (limited to 'Biz/Bild/Overlay.nix')
-rw-r--r--Biz/Bild/Overlay.nix11
1 files changed, 9 insertions, 2 deletions
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;
};
});
};