From aa0cd5e980faf1cb0b33105f86f32a8aa64f53f4 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Wed, 9 Oct 2019 22:10:48 -0700 Subject: [bild] add clay dependency --- lore/bild.nix | 12 +++++++++--- pack/ibb.nix | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lore/bild.nix b/lore/bild.nix index 9f439f8..589fda9 100644 --- a/lore/bild.nix +++ b/lore/bild.nix @@ -12,13 +12,19 @@ depsToPackageSet = packageSet: deps: map (s: builtins.getAttr s packageSet) deps; - ghc = pkgs.haskell.packages.ghc844.ghcWithPackages (hp: + ghc844_ = pkgs.haskell.packages.ghc844.override (oldAttrs: { + overrides = with pkgs.haskell.lib; self: super: { + clay = dontCheck super.clay; + }; + }); + + ghc = ghc844_.ghcWithPackages (hp: depsToPackageSet hp # we need hinotify for chip/make - depsToPackageSet hp - ([ "hinotify" ] ++ pack.deps.both ++ pack.deps.apex)); + ([ "hinotify" ] ++ pack.deps.both ++ pack.deps.apex)); ghcjs_ = pkgs.haskell.packages.ghcjs.override (oldAttrs: { overrides = with pkgs.haskell.lib; self: super: { + clay = dontCheck super.clay; http-types = dontCheck super.http-types; tasty-quickcheck = dontCheck super.tasty-quickcheck; scientific = dontCheck super.scientific; # takes forever diff --git a/pack/ibb.nix b/pack/ibb.nix index 16589b4..12f8eb4 100644 --- a/pack/ibb.nix +++ b/pack/ibb.nix @@ -2,6 +2,7 @@ name = "ibb"; deps = { both = [ + "clay" "miso" "protolude" "servant" -- cgit v1.2.3