From a7a3b2402681f53113b738c61e80e9bd7c6b77c5 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 16 Apr 2025 03:42:55 +0800
Subject: [PATCH] aptly: 1.5.0 -> 1.6.1

---
 pkgs/by-name/ap/aptly/package.nix | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ap/aptly/package.nix b/pkgs/by-name/ap/aptly/package.nix
index f04824a05fb3..2be2908a7020 100644
--- a/pkgs/by-name/ap/aptly/package.nix
+++ b/pkgs/by-name/ap/aptly/package.nix
@@ -12,18 +12,18 @@
   aptly,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "aptly";
-  version = "1.5.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "aptly-dev";
     repo = "aptly";
-    rev = "v${version}";
-    sha256 = "sha256-LqGOLXXaGfQfoj2r+aY9SdOKUDI9+22EsHKBhHMidyk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oGogOK0oQTdmlQUrIOo2BT/8wEk9kZ3mJbj0K5s9tiU=";
   };
 
-  vendorHash = "sha256-6l3OFKFTtFWT68Ylav6woczBlMhD75C9ZoQ6OeLz0Cs=";
+  vendorHash = "sha256-4z0JFC+Cz72e48ygfgA4DYJVkpInPIyA5yh//eedt8Q=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -33,21 +33,24 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X main.Version=${version}"
   ];
 
+  preBuild = ''
+    echo ${finalAttrs.version} > VERSION
+  '';
+
   postInstall = ''
     installShellCompletion --bash --name aptly completion.d/aptly
     installShellCompletion --zsh --name _aptly completion.d/_aptly
-    wrapProgram "$out/bin/aptly" \
-      --prefix PATH ":" "${
+    wrapProgram $out/bin/aptly \
+      --prefix PATH : ${
         lib.makeBinPath [
           gnupg
           bzip2
           xz
           graphviz
         ]
-      }"
+      }
   '';
 
   doCheck = false;
@@ -57,12 +60,12 @@ buildGoModule rec {
     command = "aptly version";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.aptly.info";
     description = "Debian repository management tool";
-    license = licenses.mit;
-    maintainers = with maintainers; [ montag451 ] ++ teams.bitnomial.members;
-    changelog = "https://github.com/aptly-dev/aptly/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.montag451 ] ++ lib.teams.bitnomial.members;
+    changelog = "https://github.com/aptly-dev/aptly/releases/tag/v${finalAttrs.version}";
     mainProgram = "aptly";
   };
-}
+})