From a40d653c7b633c09e87160453893ebf02c42729a Mon Sep 17 00:00:00 2001 From: Billy J Rhoades II Date: Thu, 26 Nov 2020 14:45:26 -0800 Subject: [PATCH 1/2] maintainers: add brodes --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index afcd55a0bef..504e2c389d7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1252,6 +1252,16 @@ githubId = 3043718; name = "Brett Lyons"; }; + brodes = { + email = "me@brod.es"; + github = "brhoades"; + githubId = 4763746; + name = "Billy Rhoades"; + keys = [{ + longkeyid = "rsa4096/0x8AE74787A4B7C07E"; + fingerprint = "BF4FCB85C69989B4ED95BF938AE74787A4B7C07E"; + }]; + }; bryanasdev000 = { email = "bryanasdev000@gmail.com"; github = "bryanasdev000"; From 608665f526b7e1c31b9c36d6ca1b43406453f044 Mon Sep 17 00:00:00 2001 From: Billy J Rhoades II Date: Thu, 26 Nov 2020 14:57:18 -0800 Subject: [PATCH 2/2] ytt: init at 0.30.0 Added carvel ytt 0.30.0 which is currently absent. Tests ran by checkPhase currently fail due to YAML marshalling problems, but the tool itself appears fine. --- pkgs/development/tools/ytt/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/ytt/default.nix diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix new file mode 100644 index 00000000000..05410bbaec5 --- /dev/null +++ b/pkgs/development/tools/ytt/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: +buildGoModule rec { + pname = "ytt"; + version = "0.30.0"; + + src = fetchFromGitHub { + owner = "vmware-tanzu"; + repo = "carvel-ytt"; + rev = "v${version}"; + sha256 = "0v9wp15aj4r7wif8i897zwj3c6bg41b95kk7vi3a3bzin814qn6l"; + }; + + goPackagePath = "github.com/vmware-tanzu/carvel-ytt"; + + vendorSha256 = null; + + subPackages = [ "cmd/ytt" ]; + + meta = with lib; { + description = "YAML templating tool that allows configuration of complex software via reusable templates with user-provided values"; + homepage = "https://get-ytt.io"; + license = licenses.asl20; + maintainers = with maintainers; [ brodes ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55ebbab69b0..2e4556d8636 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12156,6 +12156,8 @@ in yq-go = callPackage ../development/tools/yq-go { }; + ytt = callPackage ../development/tools/ytt {}; + winpdb = callPackage ../development/tools/winpdb { }; grabserial = callPackage ../development/tools/grabserial { };