From 611a4bff158ee2dbc4dfef755cc08790aaf8cb07 Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Thu, 25 Aug 2022 01:58:23 +0900
Subject: [PATCH 1/3] maintainers: add bitnomial team

---
 maintainers/team-list.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 13936b4fd5a5..fbd7972cb2bb 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -74,6 +74,15 @@ with lib.maintainers; {
     enableFeatureFreezePing = true;
   };
 
+  bitnomial = {
+    # Verify additions to this team with at least one already existing member of the team.
+    members = [
+      cdepillabout
+    ];
+    scope = "Group registration for packages maintained by Bitnomial.";
+    shortName = "Bitnomial employees";
+  };
+
   blockchains = {
     members = [
       mmahut

From d593085390ac8b9720314696bc6a0efd57d94b37 Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Thu, 25 Aug 2022 01:59:27 +0900
Subject: [PATCH 2/3] aptly: 1.4.0 -> 1.5.0

---
 pkgs/tools/misc/aptly/default.nix | 48 ++++++++++++++-----------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index 7f82aebabe4a..e14370da4d42 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -1,47 +1,43 @@
-{ lib, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz, testers, aptly }:
 
-let
+buildGoModule rec {
+  pname = "aptly";
+  version = "1.5.0";
 
-  version = "1.4.0";
-  rev = "v${version}";
-
-  aptlySrc = fetchFromGitHub {
-    inherit rev;
+  src = fetchFromGitHub {
     owner = "aptly-dev";
     repo = "aptly";
-    sha256 = "06cq761r3bxybb9xn58jii0ggp79mcp3810z1r2z3xcvplwhwnhy";
+    rev = "v${version}";
+    sha256 = "sha256-LqGOLXXaGfQfoj2r+aY9SdOKUDI9+22EsHKBhHMidyk=";
   };
 
-  aptlyCompletionSrc = fetchFromGitHub {
-    rev = "1.0.1";
-    owner = "aptly-dev";
-    repo = "aptly-bash-completion";
-    sha256 = "0dkc4z687yk912lpv8rirv0nby7iny1zgdvnhdm5b47qmjr1sm5q";
-  };
-
-in
-
-buildGoPackage {
-  pname = "aptly";
-  inherit version;
-
-  src = aptlySrc;
-
-  goPackagePath = "github.com/aptly-dev/aptly";
+  vendorSha256 = "sha256-6l3OFKFTtFWT68Ylav6woczBlMhD75C9ZoQ6OeLz0Cs=";
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];
 
+  ldflags = [ "-s" "-w" "-X main.Version=${version}" ];
+
   postInstall = ''
-    installShellCompletion --bash ${aptlyCompletionSrc}/aptly
+    installShellCompletion --bash --name aptly completion.d/aptly
+    installShellCompletion --zsh --name _aptly completion.d/_aptly
     wrapProgram "$out/bin/aptly" \
       --prefix PATH ":" "${lib.makeBinPath [ gnupg bzip2 xz graphviz ]}"
   '';
 
+  doCheck = false;
+
+  passthru.tests.version = testers.testVersion {
+    package = aptly;
+    command = "aptly version";
+  };
+
   meta = with lib; {
     homepage = "https://www.aptly.info";
     description = "Debian repository management tool";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = [ maintainers.montag451 ];
+    maintainers = with maintainers; [ montag451 ];
+    changelog =
+      "https://github.com/aptly-dev/aptly/releases/tag/v${version}";
   };
 }

From 2c245c5dd398e7841c1049ffc3455fa69c02a84f Mon Sep 17 00:00:00 2001
From: Dennis Gosnell <cdep.illabout@gmail.com>
Date: Thu, 25 Aug 2022 01:59:49 +0900
Subject: [PATCH 3/3] aptly: add bitnomial members as maintainers

---
 pkgs/tools/misc/aptly/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index e14370da4d42..e42d4871e117 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
     description = "Debian repository management tool";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ montag451 ];
+    maintainers = with maintainers; [ montag451 ] ++ teams.bitnomial.members;
     changelog =
       "https://github.com/aptly-dev/aptly/releases/tag/v${version}";
   };