From aaaadbbcdc8234a5cdafa9591b823acddb3897da Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 23 Mar 2021 23:46:00 +0200 Subject: chore: Remove //overrides from depot This mechanism wasn't actually used for anything other than a minor external compatibility thing for buildGo.nix, which can also be solved with a function parameter. This breaks //fun/gemma because it means that the elmPackages used to build it are no longer reachable from depot. We'll sort this out later. Change-Id: I1bf2240435e869cdc4e99bdd1a138fdd2e76f96e Reviewed-on: https://cl.tvl.fyi/c/depot/+/2646 Tested-by: BuildkiteCI Reviewed-by: sterni --- fun/gemma/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'fun') diff --git a/fun/gemma/default.nix b/fun/gemma/default.nix index 55612106d2..a47365924a 100644 --- a/fun/gemma/default.nix +++ b/fun/gemma/default.nix @@ -1,13 +1,12 @@ { depot, ... }: let - inherit (depot) elmPackages; inherit (depot.third_party) cacert iana-etc libredirect stdenv runCommandNoCC writeText; frontend = stdenv.mkDerivation { name = "gemma-frontend.html"; src = ./frontend; - buildInputs = [ cacert iana-etc elmPackages.elm ]; + buildInputs = [ cacert iana-etc ]; # elmPackages.elm # The individual Elm packages this requires are not packaged and I # can't be bothered to do that now, so lets open the escape hatch: @@ -47,4 +46,6 @@ in depot.nix.buildLisp.program { ./src/gemma.lisp injectFrontend ]; -} +# depot does not currently have Gemma's frontend dependencies, thus +# the build is disabled. +} // { meta.ci = false; } -- cgit 1.4.1