From eafe219c06deed702d875e4ba45c286020cacbab Mon Sep 17 00:00:00 2001
From: jolheiser <git@jolheiser.com>
Date: Fri, 4 Apr 2025 09:37:33 -0500
Subject: [PATCH 1/3] maintainers: add jolheiser

Signed-off-by: jolheiser <git@jolheiser.com>
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 014ac42e06cd..e1f79ce2369f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11706,6 +11706,12 @@
     name = "Johan Larsson";
     keys = [ { fingerprint = "F0D6 BDE7 C7D1 6B3F 7883  73E7 2A41 C0FE DD6F F540"; } ];
   };
+  jolheiser = {
+    email = "nixpkgs@jolheiser.com";
+    github = "jolheiser";
+    githubId = 42128690;
+    name = "John Olheiser";
+  };
   jonaenz = {
     name = "Jona Enzinger";
     email = "5xt3zyy5l@mozmail.com";

From 74b6c3d3854eaa8b5b3a70a96c55374cc54f5060 Mon Sep 17 00:00:00 2001
From: jolheiser <git@jolheiser.com>
Date: Fri, 4 Apr 2025 09:41:57 -0500
Subject: [PATCH 2/3] git-pr: update package license and output, add jolheiser
 to maintainers

The license has always been MIT, this commit just updates the meta to reflect that.

There is also a web output that is now renamed similarly to the ssh binary.

Signed-off-by: jolheiser <git@jolheiser.com>
---
 pkgs/by-name/gi/git-pr/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/git-pr/package.nix b/pkgs/by-name/gi/git-pr/package.nix
index eb7b97817832..abfd057f27a8 100644
--- a/pkgs/by-name/gi/git-pr/package.nix
+++ b/pkgs/by-name/gi/git-pr/package.nix
@@ -19,13 +19,17 @@ buildGoModule rec {
 
   postInstall = ''
     mv $out/bin/ssh $out/bin/git-ssh
+    mv $out/bin/web $out/bin/git-web
   '';
 
   meta = {
     homepage = "https://pr.pico.sh";
     description = "Simple git collaboration tool";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ sigmanificient ];
-    mainProgram = "git-pr";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      sigmanificient
+      jolheiser
+    ];
+    mainProgram = "git-ssh";
   };
 }

From 6ec658ad6ac3e754849f1db0abf765260304e8b3 Mon Sep 17 00:00:00 2001
From: jolheiser <git@jolheiser.com>
Date: Fri, 4 Apr 2025 09:45:54 -0500
Subject: [PATCH 3/3] git-pr: 0.0.2 -> 0.3.0

Signed-off-by: jolheiser <git@jolheiser.com>
---
 pkgs/by-name/gi/git-pr/package.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/git-pr/package.nix b/pkgs/by-name/gi/git-pr/package.nix
index abfd057f27a8..2edcddc5acf8 100644
--- a/pkgs/by-name/gi/git-pr/package.nix
+++ b/pkgs/by-name/gi/git-pr/package.nix
@@ -6,16 +6,28 @@
 
 buildGoModule rec {
   pname = "git-pr";
-  version = "0.0.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "picosh";
     repo = "git-pr";
     rev = "v${version}";
-    hash = "sha256-7Ka8p5X8nQBXKiT6QsWOWMQJL8rePKrHz/LZU1W+oQ8=";
+    hash = "sha256-2A2rP7yr8faVoIYAWprr+t7MwDPerhsuOjWWEl1mhXw=";
   };
 
-  vendorHash = "sha256-tu5C7hz6UTgn/jCCotXzZHlUmGVNERhA7Osxi31Domk=";
+  vendorHash = "sha256-7aHr5CWZVmhBiuCXaK49zYJXMufCxZBnS917mF0QJlg=";
+
+  subPackages = [
+    "cmd/ssh"
+    "cmd/web"
+  ];
+
+  env.CGO_ENABLED = 0;
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
 
   postInstall = ''
     mv $out/bin/ssh $out/bin/git-ssh