about summary refs log tree commit diff
path: root/overrides
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-12-20T22·19+0000
committerVincent Ambo <tazjin@google.com>2019-12-20T22·19+0000
commitdb307701013b73f51a544116b9ec1ff37ab0f8df (patch)
tree4a54ba9867e039b757e00694c9f39394db3943e1 /overrides
parenta9f5c637071879eb1497c447b3caa10ff838b32e (diff)
fix(kontemplate): Make build compatible with readTree r/252
The kontemplate build will keep using `buildGoPackage` for now until
I've had the time to add tests to //nix/buildGo
Diffstat (limited to 'overrides')
-rw-r--r--overrides/kontemplate/default.nix18
1 files changed, 6 insertions, 12 deletions
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}
 ''