From bc861c066c724f45668f560536db8b0dc018b365 Mon Sep 17 00:00:00 2001 From: Nick Wilburn Date: Thu, 27 Apr 2023 15:44:56 +0000 Subject: [PATCH 1/2] zarf: init at 0.26.2 --- .../networking/cluster/zarf/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/networking/cluster/zarf/default.nix diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix new file mode 100644 index 000000000000..8ceacdf1261e --- /dev/null +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "zarf"; + version = "0.26.2"; + + src = fetchFromGitHub { + owner = "defenseunicorns"; + repo = "zarf"; + rev = "v${version}"; + hash = "sha256-45ZGHw/u0IkDJSlNaNg9At4rvBU9+CVix8Bp58hE6gk="; + }; + + vendorHash = "sha256-5k2NnQ18bL0v7YHTvw2nz5H5n5DQOmozkUhyf97eKl8="; + proxyVendor = true; + + preBuild = '' + mkdir -p build/ui + touch build/ui/index.html + ''; + + doCheck = false; + + ldflags = [ "-s" "-w" "-X" "github.com/defenseunicorns/zarf/src/config.CLIVersion=${src.rev}" "-X" "k8s.io/component-base/version.gitVersion=v0.0.0+zarf${src.rev}" "-X" "k8s.io/component-base/version.gitCommit=${src.rev}" "-X" "k8s.io/component-base/version.buildDate=1970-01-01T00:00:00Z" ]; + + meta = with lib; { + description = "DevSecOps for Air Gap & Limited-Connection Systems. https://zarf.dev"; + homepage = "https://github.com/defenseunicorns/zarf.git"; + license = licenses.asl20; + maintainers = with maintainers; [ ragingpastry ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17cc6784d66b..6257fa62339f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35237,6 +35237,8 @@ with pkgs; zammad = callPackage ../applications/networking/misc/zammad { }; + zarf = callPackage ../applications/networking/cluster/zarf { }; + zathuraPkgs = callPackage ../applications/misc/zathura { }; zathura = zathuraPkgs.zathuraWrapper; From e2ae1aefa36726fcd6e1145306230083035bea2a Mon Sep 17 00:00:00 2001 From: Nick Wilburn Date: Thu, 4 May 2023 17:24:14 -0500 Subject: [PATCH 2/2] maintainers: add ragingpastry as maintainer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f6fe80e2f422..a77ede462659 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12861,6 +12861,12 @@ githubId = 903072; name = "Raghav Sood"; }; + ragingpastry = { + email = "senior.crepe@gmail.com"; + github = "ragingpastry"; + githubId = 6778250; + name = "Nick Wilburn"; + }; raitobezarius = { email = "ryan@lahfa.xyz"; matrix = "@raitobezarius:matrix.org";