From 08b6da8c089a30d1e8c6d6b3db5e50047d8f89bf Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Sun, 11 Sep 2022 10:56:11 +0200 Subject: [PATCH 1/6] konf: init at 0.2.0 --- pkgs/development/tools/konf/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/konf/default.nix diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix new file mode 100644 index 000000000000..846595a9c8e0 --- /dev/null +++ b/pkgs/development/tools/konf/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildGoModule +, fetchFromGitHub }: + +buildGoModule rec { + pname = "konf"; + version = "0.2.0"; + + src = fetchFromGitHub { + rev = "main"; + owner = "SimonTheLeg"; + repo = "konf-go"; + sha256 = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k="; + }; + + vendorSha256 = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8="; + + meta = with lib; { + description = "Lightweight and blazing fast kubeconfig manager which allows to use different kubeconfigs at the same time"; + homepage = "https://github.com/SimonTheLeg/konf-go"; + license = licenses.asl20; + maintainers = with maintainers; [ arikgrahl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfe89a1f8613..a0171239287d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15067,6 +15067,8 @@ with pkgs; kona = callPackage ../development/interpreters/kona {}; + konf = callPackage ../development/tools/konf { }; + lolcode = callPackage ../development/interpreters/lolcode { }; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; From 24a24101223681e6c73671c69f3df9a401f97a54 Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Sun, 11 Sep 2022 13:37:05 +0200 Subject: [PATCH 2/6] reformat code --- pkgs/development/tools/konf/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index 846595a9c8e0..fa8726b6ea98 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -1,15 +1,16 @@ { lib , buildGoModule -, fetchFromGitHub }: +, fetchFromGitHub +}: buildGoModule rec { pname = "konf"; version = "0.2.0"; src = fetchFromGitHub { - rev = "main"; - owner = "SimonTheLeg"; - repo = "konf-go"; + rev = "main"; + owner = "SimonTheLeg"; + repo = "konf-go"; sha256 = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k="; }; From fa3e7042dd0eddf339d2e52e8d0d1dedd3de9880 Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Sun, 11 Sep 2022 13:38:54 +0200 Subject: [PATCH 3/6] use `hash`/`vendorHash` in favor of `sha256`/`vendorSha256` --- pkgs/development/tools/konf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index fa8726b6ea98..44e56541db63 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { rev = "main"; owner = "SimonTheLeg"; repo = "konf-go"; - sha256 = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k="; + hash = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k="; }; - vendorSha256 = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8="; + vendorHash = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8="; meta = with lib; { description = "Lightweight and blazing fast kubeconfig manager which allows to use different kubeconfigs at the same time"; From 27dee9344ad3355828d125a187894388d6420117 Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Sun, 11 Sep 2022 13:40:07 +0200 Subject: [PATCH 4/6] add `ldflags` -s and -w --- pkgs/development/tools/konf/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index 44e56541db63..dbae81fdf677 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -16,6 +16,8 @@ buildGoModule rec { vendorHash = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8="; + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Lightweight and blazing fast kubeconfig manager which allows to use different kubeconfigs at the same time"; homepage = "https://github.com/SimonTheLeg/konf-go"; From d2e32869962884d5f18f08b372bb1737c55906ba Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Sun, 11 Sep 2022 14:21:19 +0200 Subject: [PATCH 5/6] specify version in `rev` --- pkgs/development/tools/konf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index dbae81fdf677..61711a6ebae2 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { version = "0.2.0"; src = fetchFromGitHub { - rev = "main"; + rev = "v${version}"; owner = "SimonTheLeg"; repo = "konf-go"; hash = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k="; From 58fe78b99b167a51acd6ba87ba7c7e47da9cbb85 Mon Sep 17 00:00:00 2001 From: Arik Grahl Date: Mon, 12 Sep 2022 10:37:31 +0200 Subject: [PATCH 6/6] change order in `fetchFromGitHub` --- pkgs/development/tools/konf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index 61711a6ebae2..9747dbe69616 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -8,9 +8,9 @@ buildGoModule rec { version = "0.2.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "SimonTheLeg"; repo = "konf-go"; + rev = "v${version}"; hash = "sha256-UeuR7lsNG2Y0hdpQA5NXBUlSvYeixyKS73N95z5TZ7k="; };