From bc9e5b0ea863a17537987faa5a72b00efc7767d1 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 18 Jul 2022 22:09:58 -0400 Subject: Upgrade nixpkgs, ghc923 I ended up deleting miso, and consequently all files under Hero/ and Miso/, because I couldn't get miso to build with GHC 9.2. Other things: - Niv has been wrapped by Biz/Bild/Deps.hs, so I can extend it to my liking. - Apply-refact is gone because I couldn't get it to build. - Disabled python stuff. --- Biz/Bild/Deps.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Biz/Bild/Deps.nix') diff --git a/Biz/Bild/Deps.nix b/Biz/Bild/Deps.nix index 4f16250..84639b5 100644 --- a/Biz/Bild/Deps.nix +++ b/Biz/Bild/Deps.nix @@ -14,11 +14,17 @@ in rec overrides = with super.pkgs.haskell.lib; sel: sup: super.overridePinnedDeps (buildCabal sel) // { acid-state = dontCheck sup.acid-state; # mac: "too many open files" + clay = doJailbreak sup.clay; + envy = doJailbreak sup.envy; + fast-tags = sup.fast-tags.overrideAttrs (old: old // { patches = []; }); + generic-data = dontCheck sup.generic-data; # https://github.com/Lysxia/generic-data/issues/56 ghcjs-base = null; # otherwise ghc tries to build this via overridePinnedDeps - servant-auth = buildCabalSubdir sel {name = "servant-auth";}; + readable = doJailbreak sup.readable; # why is this even being built? + servant-auth = doJailbreak (buildCabalSubdir sel {name = "servant-auth"; subdir = "servant-auth/servant-auth";}); servant-server = doJailbreak sup.servant-server; + stripe-core = doJailbreak sup.stripe-core; stripe-haskell = dontCheck sup.stripe-haskell; - stripe-http-client = dontCheck sup.stripe-http-client; + stripe-http-client = doJailbreak (dontCheck sup.stripe-http-client); temporary = dontCheck sup.temporary; wai-middleware-metrics = dontCheck sup.wai-middleware-metrics; }; -- cgit v1.2.3