From 1db4fee3bd8ac37d19d549a1e4d771c96a6fa927 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 4 Oct 2024 13:46:01 +0200 Subject: [PATCH 1/3] Revert "agebox: drop, lack of upstream maintenance" This reverts commit dd70191416ea6f9d970161dd90d7f6f2066feea7. --- pkgs/tools/security/agebox/default.nix | 39 ++++++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/security/agebox/default.nix diff --git a/pkgs/tools/security/agebox/default.nix b/pkgs/tools/security/agebox/default.nix new file mode 100644 index 000000000000..fb75fbf9b093 --- /dev/null +++ b/pkgs/tools/security/agebox/default.nix @@ -0,0 +1,39 @@ +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: + +buildGoModule rec { + pname = "agebox"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "slok"; + repo = pname; + rev = "v${version}"; + hash = "sha256-W6/v5BIl+k6tMan/Wdua7mHKMsq23QZN13Cy24akJr4="; + }; + + patches = [ + # Update gopkg.in/yaml.v2 to v2.2.8 to fix vulnerabilities. + # https://github.com/slok/agebox/pull/199 + (fetchpatch { + url = "https://github.com/slok/agebox/commit/40a515d39911f601ebe05cc914e8a02695d85dc7.patch"; + hash = "sha256-0iBI0nID12OoWqWY/8MPb3vvTUDe0JdSHu2vefix/bM="; + }) + ]; + + vendorHash = "sha256-MNAF2ExIOYPzXyGR6H7lfUEhnMDCyD7ecst5MKm7u+A="; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/slok/agebox"; + changelog = "https://github.com/slok/agebox/releases/tag/v${version}"; + description = "Age based repository file encryption gitops tool"; + license = licenses.asl20; + maintainers = with maintainers; [ lesuisse ]; + mainProgram = "agebox"; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 972743705c9f..9884796a343e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -95,7 +95,6 @@ mapAliases { aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15 afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21 agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10" - agebox = throw "agebox has been removed due to lack of upstream maintenance"; # Added 2024-07-13 airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream"; # Added 2023-07-28 alsa-project = throw "alsa-project was removed and its sub-attributes were promoted to top-level."; # Added 2023-11-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9afca4a121b2..be6362ccd0c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6570,6 +6570,8 @@ with pkgs; age = callPackage ../tools/security/age { }; + agebox = callPackage ../tools/security/agebox { }; + age-plugin-ledger = callPackage ../tools/security/age-plugin-ledger { inherit (darwin.apple_sdk.frameworks) AppKit; }; From ac0e99f15b9186cbcc34c5573cb05b84e4df9f9c Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 4 Oct 2024 13:54:37 +0200 Subject: [PATCH 2/3] agebox: 0.6.1 -> 0.7.1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/security/agebox/default.nix | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/security/agebox/default.nix b/pkgs/tools/security/agebox/default.nix index fb75fbf9b093..3f9d73063ac2 100644 --- a/pkgs/tools/security/agebox/default.nix +++ b/pkgs/tools/security/agebox/default.nix @@ -1,30 +1,26 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ + lib, + # Required based on 'go' directive in go.mod, + # remove when Go in nixpkgs defaults to 1.23 or later. + buildGo123Module, + fetchFromGitHub, +}: -buildGoModule rec { +buildGo123Module rec { pname = "agebox"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "slok"; repo = pname; rev = "v${version}"; - hash = "sha256-W6/v5BIl+k6tMan/Wdua7mHKMsq23QZN13Cy24akJr4="; + hash = "sha256-RtFa7k+tw0hyf7bYm51aIxptaD4uOH6/3WDjeoWEEKA="; }; - patches = [ - # Update gopkg.in/yaml.v2 to v2.2.8 to fix vulnerabilities. - # https://github.com/slok/agebox/pull/199 - (fetchpatch { - url = "https://github.com/slok/agebox/commit/40a515d39911f601ebe05cc914e8a02695d85dc7.patch"; - hash = "sha256-0iBI0nID12OoWqWY/8MPb3vvTUDe0JdSHu2vefix/bM="; - }) - ]; - - vendorHash = "sha256-MNAF2ExIOYPzXyGR6H7lfUEhnMDCyD7ecst5MKm7u+A="; + vendorHash = "sha256-57YbYDvRYOzQATEFpAuGzQzOYNY8n5LUrcu8jhjSiNI="; ldflags = [ "-s" - "-w" "-X main.Version=${version}" ]; From 0bd28ed1e560fcecc53078c12af979ca18534c15 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 4 Oct 2024 13:56:37 +0200 Subject: [PATCH 3/3] agebox: move to by-name Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../agebox/default.nix => by-name/ag/agebox/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/agebox/default.nix => by-name/ag/agebox/package.nix} (100%) diff --git a/pkgs/tools/security/agebox/default.nix b/pkgs/by-name/ag/agebox/package.nix similarity index 100% rename from pkgs/tools/security/agebox/default.nix rename to pkgs/by-name/ag/agebox/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be6362ccd0c8..9afca4a121b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6570,8 +6570,6 @@ with pkgs; age = callPackage ../tools/security/age { }; - agebox = callPackage ../tools/security/agebox { }; - age-plugin-ledger = callPackage ../tools/security/age-plugin-ledger { inherit (darwin.apple_sdk.frameworks) AppKit; };