From db307701013b73f51a544116b9ec1ff37ab0f8df Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 20 Dec 2019 22:19:52 +0000 Subject: fix(kontemplate): Make build compatible with readTree The kontemplate build will keep using `buildGoPackage` for now until I've had the time to add tests to //nix/buildGo --- overrides/kontemplate/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'overrides') diff --git a/overrides/kontemplate/default.nix b/overrides/kontemplate/default.nix index 74693c3837..52da1ba32c 100644 --- a/overrides/kontemplate/default.nix +++ b/overrides/kontemplate/default.nix @@ -1,19 +1,13 @@ { pkgs, ... }: -let master = pkgs.third_party.kontemplate.overrideAttrs(_: { - src = pkgs.third_party.fetchFromGitHub { - owner = "tazjin"; - repo = "kontemplate"; - rev = "v1.8.0"; - sha256 = "123mjmmm4hynraq1fpn3j5i0a1i87l265kkjraxxxbl0zacv74i1"; - }; -}); -in pkgs.third_party.writeShellScriptBin "kontemplate" '' - export PATH="${pkgs.ops.kms_pass}/bin:$PATH" +with pkgs; + +third_party.writeShellScriptBin "kontemplate" '' + export PATH="${ops.kms_pass}/bin:$PATH" if [[ -z $1 ]]; then - exec ${master}/bin/kontemplate + exec ${ops.kontemplate}/bin/kontemplate fi - exec ${master}/bin/kontemplate $1 ${./../..}/ops/infra/kubernetes/primary-cluster.yaml ''${@:2} + exec ${ops.kontemplate}/bin/kontemplate $1 ${./../..}/ops/infra/kubernetes/primary-cluster.yaml ''${@:2} '' -- cgit 1.4.1