From ee4b487df5294e8b122ef06e1f641c822efc2d8b Mon Sep 17 00:00:00 2001 From: Curtis John Date: Sat, 1 Oct 2022 18:37:00 -0400 Subject: [PATCH 1/8] kns: init @ 50b6370c88136a580599c913f0fae2cb24981dc1 --- .../networking/cluster/kns/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kns/default.nix diff --git a/pkgs/applications/networking/cluster/kns/default.nix b/pkgs/applications/networking/cluster/kns/default.nix new file mode 100644 index 000000000000000..e25528134716df1 --- /dev/null +++ b/pkgs/applications/networking/cluster/kns/default.nix @@ -0,0 +1,33 @@ +{ stdenvNoCC, lib, fetchFromGitHub, bash }: + +stdenvNoCC.mkDerivation rec { + pname = "kns"; + version = "50b6370c88136a580599c913f0fae2cb24981dc1"; + + src = fetchFromGitHub { + owner = "blendle"; + repo = pname; + rev = version; + sha256 = "1y7m6ln3xricmrwf8638hqbmnbipfag1c1c04apfd4vcj7sqzm6b"; + }; + + strictDeps = true; + buildInputs = [ bash ]; + + installPhase = '' + runHook preInstall + + install -m755 ./bin/kns -D $out/bin/kns + + runHook postInstall + ''; + + meta = with lib; { + description = "Kubernetes namespace switcher"; + homepage = "https://github.com/blendle/kns"; + license = licenses.isc; + maintainers = with maintainers; [ crutonjohn ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c1dbd70ec4b00e..f7f43554f884030 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29203,6 +29203,8 @@ with pkgs; kn = callPackage ../applications/networking/cluster/kn { }; + kns = callPackage ../applications/networking/cluster/kns { }; + kondo = callPackage ../applications/misc/kondo { }; kooha = callPackage ../applications/video/kooha { }; From 31dc9f836d46037919f7b771931c241a0acaf780 Mon Sep 17 00:00:00 2001 From: Curtis John Date: Sat, 1 Oct 2022 22:48:35 -0400 Subject: [PATCH 2/8] maintainers: add crutonjohn --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2195778492eb870..0fd940f61f1fe21 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2832,6 +2832,12 @@ fingerprint = "2017 E152 BB81 5C16 955C E612 45BC C1E2 709B 1788"; }]; }; + crutonjohn = { + email = "crutonjohn+nixos@pm.me"; + github = "crutonjohn"; + githubId = 19677342; + name = "Curtis Ray John"; + }; cryptix = { email = "cryptix@riseup.net"; github = "cryptix"; From af41e1d01871ff11c396e1d74be126b508453f15 Mon Sep 17 00:00:00 2001 From: Curtis John Date: Sun, 2 Oct 2022 13:55:00 -0400 Subject: [PATCH 3/8] kns: version tag to unstable --- pkgs/applications/networking/cluster/kns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kns/default.nix b/pkgs/applications/networking/cluster/kns/default.nix index e25528134716df1..82171498246f64a 100644 --- a/pkgs/applications/networking/cluster/kns/default.nix +++ b/pkgs/applications/networking/cluster/kns/default.nix @@ -2,7 +2,7 @@ stdenvNoCC.mkDerivation rec { pname = "kns"; - version = "50b6370c88136a580599c913f0fae2cb24981dc1"; + version = "unstable-2022-03-03"; src = fetchFromGitHub { owner = "blendle"; From 272b7cfca714f28b636f19f03ab438a1260c5604 Mon Sep 17 00:00:00 2001 From: Curtis John Date: Mon, 23 Jan 2023 22:36:01 -0500 Subject: [PATCH 4/8] kns: change version to reference a specific commit as this repo does not have releases --- pkgs/applications/networking/cluster/kns/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kns/default.nix b/pkgs/applications/networking/cluster/kns/default.nix index 82171498246f64a..6bfafdb69711e04 100644 --- a/pkgs/applications/networking/cluster/kns/default.nix +++ b/pkgs/applications/networking/cluster/kns/default.nix @@ -7,12 +7,11 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "blendle"; repo = pname; - rev = version; - sha256 = "1y7m6ln3xricmrwf8638hqbmnbipfag1c1c04apfd4vcj7sqzm6b"; + rev = "adddff3690d6bde62844e68e0edf304023927a9b"; + sha256 = "sha256-zcJaH+Uyc/rCDRlQi+lSKaG7z4VWlNZ13klDnvL3Jgc="; }; strictDeps = true; - buildInputs = [ bash ]; installPhase = '' runHook preInstall From 013daa15349a01cec31e9159dbcd61e1ff4e4654 Mon Sep 17 00:00:00 2001 From: Curtis John Date: Thu, 6 Jul 2023 17:47:15 -0400 Subject: [PATCH 5/8] Update pkgs/applications/networking/cluster/kns/default.nix Co-authored-by: Manuel Mendez <708570+mmlb@users.noreply.github.com> --- pkgs/applications/networking/cluster/kns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kns/default.nix b/pkgs/applications/networking/cluster/kns/default.nix index 6bfafdb69711e04..56479e4bb0a4b34 100644 --- a/pkgs/applications/networking/cluster/kns/default.nix +++ b/pkgs/applications/networking/cluster/kns/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, fetchFromGitHub, bash }: +{ stdenvNoCC, lib, fetchFromGitHub, fzf, kubectl }: stdenvNoCC.mkDerivation rec { pname = "kns"; From 3524002a194e56ecc4b56c1b9044a171b5e6d461 Mon Sep 17 00:00:00 2001 From: Curtis John Date: Thu, 6 Jul 2023 17:47:28 -0400 Subject: [PATCH 6/8] Update pkgs/applications/networking/cluster/kns/default.nix Co-authored-by: Manuel Mendez <708570+mmlb@users.noreply.github.com> --- pkgs/applications/networking/cluster/kns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kns/default.nix b/pkgs/applications/networking/cluster/kns/default.nix index 56479e4bb0a4b34..5643e4414cf9609 100644 --- a/pkgs/applications/networking/cluster/kns/default.nix +++ b/pkgs/applications/networking/cluster/kns/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "kns"; - version = "unstable-2022-03-03"; + version = "unstable-2022-04-25"; src = fetchFromGitHub { owner = "blendle"; repo = pname; - rev = "adddff3690d6bde62844e68e0edf304023927a9b"; - sha256 = "sha256-zcJaH+Uyc/rCDRlQi+lSKaG7z4VWlNZ13klDnvL3Jgc="; + rev = "86502949c31432bd95895cfb26d1c5893c533d5c"; + sha256 = "sha256-8AR/fEKPAfiKCZrp/AyJo3Ic8dH7SfncYZSdQA2GywQ="; }; strictDeps = true; From 161f8ce6570828afe38fab62ba771be9699e8052 Mon Sep 17 00:00:00 2001 From: Curtis John Date: Thu, 6 Jul 2023 17:47:56 -0400 Subject: [PATCH 7/8] Update pkgs/applications/networking/cluster/kns/default.nix Co-authored-by: Manuel Mendez <708570+mmlb@users.noreply.github.com> --- pkgs/applications/networking/cluster/kns/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kns/default.nix b/pkgs/applications/networking/cluster/kns/default.nix index 5643e4414cf9609..0f1da6d96ec57f7 100644 --- a/pkgs/applications/networking/cluster/kns/default.nix +++ b/pkgs/applications/networking/cluster/kns/default.nix @@ -16,7 +16,8 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -m755 ./bin/kns -D $out/bin/kns + substituteInPlace bin/kns bin/ktx --replace fzf ${fzf}/bin/fzf --replace kubectl ${kubectl}/bin/kubectl + install -D -m755 -t $out/bin bin/kns bin/ktx runHook postInstall ''; From 49eee631f4fb7c9ceed82926cf877d0e6790fa4f Mon Sep 17 00:00:00 2001 From: Curtis John Date: Thu, 6 Jul 2023 18:05:48 -0400 Subject: [PATCH 8/8] add build inputes in light of other changes --- pkgs/applications/networking/cluster/kns/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/cluster/kns/default.nix b/pkgs/applications/networking/cluster/kns/default.nix index 0f1da6d96ec57f7..0f3e0d767783d2b 100644 --- a/pkgs/applications/networking/cluster/kns/default.nix +++ b/pkgs/applications/networking/cluster/kns/default.nix @@ -13,6 +13,8 @@ stdenvNoCC.mkDerivation rec { strictDeps = true; + buildInputs = [ fzf kubectl ]; + installPhase = '' runHook preInstall