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
This commit is contained in:
Vincent Ambo 2019-12-20 22:19:52 +00:00
parent a9f5c63707
commit db30770101
5 changed files with 10 additions and 16 deletions

View file

@ -10,6 +10,7 @@ in with pkgs; [
nix.yants.tests
ops.journaldriver
ops.kms_pass
ops.kontemplate
ops.sync-gcsr
tools.blog_cli
tools.emacs

View file

@ -1,8 +1,6 @@
Kontemplate - A simple Kubernetes templater
===========================================
[![Build Status](https://travis-ci.org/tazjin/kontemplate.svg?branch=master)](https://travis-ci.org/tazjin/kontemplate)
[Kontemplate][] is a simple CLI tool that can take sets of Kubernetes resource
files with placeholders and insert values per environment.

View file

@ -10,9 +10,9 @@
# This file is the Nix derivation used to install Kontemplate on
# Nix-based systems.
{ pkgs ? import <nixpkgs> {} }:
{ pkgs, ... }:
with pkgs; buildGoPackage rec {
with pkgs.third_party; buildGoPackage rec {
name = "kontemplate-${version}";
version = "master";
src = ./.;

View file

@ -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}
''

View file

@ -59,6 +59,7 @@ let
notmuch
openssh
openssl
parallel
pkgconfig
protobuf
remarshal