From a34f21576968d0d68aaed40106a3e9a7d7f5bcc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= <work@jlbribeiro.com>
Date: Tue, 8 Oct 2024 21:44:23 +0100
Subject: [PATCH 1/7] granted: format using nixfmt

---
 pkgs/by-name/gr/granted/package.nix | 30 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index 43a32eb4d180f..aa460683f544c 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -1,13 +1,14 @@
-{ bash
-, buildGoModule
-, fetchFromGitHub
+{
+  bash,
+  buildGoModule,
+  fetchFromGitHub,
 
-, withFish ? false
-, fish
+  withFish ? false,
+  fish,
 
-, lib
-, makeWrapper
-, xdg-utils
+  lib,
+  makeWrapper,
+  xdg-utils,
 }:
 
 buildGoModule rec {
@@ -73,12 +74,13 @@ buildGoModule rec {
 
       # Insert below the #!/bin/sh shebang
       echo "$addToPath" | sed "/#!\/bin\/sh/r /dev/stdin" $src/scripts/assume >> $out/bin/assume
-  '' + lib.optionalString withFish ''
-    # Install fish script
-    install -Dm755 $src/scripts/assume.fish $out/share/assume.fish
-    substituteInPlace $out/share/assume.fish \
-      --replace /bin/fish ${fish}/bin/fish
-  '';
+    ''
+    + lib.optionalString withFish ''
+      # Install fish script
+      install -Dm755 $src/scripts/assume.fish $out/share/assume.fish
+      substituteInPlace $out/share/assume.fish \
+        --replace /bin/fish ${fish}/bin/fish
+    '';
 
   meta = with lib; {
     description = "Easiest way to access your cloud";

From b7b77c5f955b5dbb478b40048e64a6c954136114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= <work@jlbribeiro.com>
Date: Tue, 8 Oct 2024 21:45:31 +0100
Subject: [PATCH 2/7] granted: set updateScript

---
 pkgs/by-name/gr/granted/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index aa460683f544c..c73a9c4570922 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -2,6 +2,7 @@
   bash,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
 
   withFish ? false,
   fish,
@@ -82,6 +83,8 @@ buildGoModule rec {
         --replace /bin/fish ${fish}/bin/fish
     '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Easiest way to access your cloud";
     homepage = "https://github.com/common-fate/granted";

From b74384f636cd115242916f0690bf028d6065ddb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= <work@jlbribeiro.com>
Date: Tue, 8 Oct 2024 23:50:34 +0100
Subject: [PATCH 3/7] granted: add versionCheckHook

---
 pkgs/by-name/gr/granted/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index c73a9c4570922..7da58b9b857db 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -3,6 +3,7 @@
   buildGoModule,
   fetchFromGitHub,
   nix-update-script,
+  versionCheckHook,
 
   withFish ? false,
   fish,
@@ -83,6 +84,9 @@ buildGoModule rec {
         --replace /bin/fish ${fish}/bin/fish
     '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {

From a40bac7fd1d7ef1285adb625e54c32ced5794207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= <work@jlbribeiro.com>
Date: Wed, 9 Oct 2024 17:11:13 +0100
Subject: [PATCH 4/7] granted: add jlbribeiro as maintainer

Removes @ivankovnatsky as maintainer following
https://github.com/NixOS/nixpkgs/pull/347364#pullrequestreview-2357233641
---
 pkgs/by-name/gr/granted/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index 7da58b9b857db..15e64442a1899 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -94,6 +94,8 @@ buildGoModule rec {
     homepage = "https://github.com/common-fate/granted";
     changelog = "https://github.com/common-fate/granted/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = [ maintainers.ivankovnatsky ];
+    maintainers = with maintainers; [
+      jlbribeiro
+    ];
   };
 }

From 32656bcd29c062773b7740e3d576308aa1300a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= <work@jlbribeiro.com>
Date: Tue, 8 Oct 2024 21:46:30 +0100
Subject: [PATCH 5/7] granted: 0.34.1 -> 0.35.0

Diff: https://github.com/common-fate/granted/compare/v0.34.1...v0.35.0
Changelog: https://github.com/common-fate/granted/releases/tag/v0.35.0
---
 pkgs/by-name/gr/granted/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index 15e64442a1899..743af20d1ba30 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -15,16 +15,16 @@
 
 buildGoModule rec {
   pname = "granted";
-  version = "0.34.1";
+  version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "common-fate";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-iNGagF4+Lz73Ctvh8Qs90E+xvuGi7LWHV/VbjjqMqRY=";
+    sha256 = "sha256-0zFM7QH2JrYt7zakf1xj3F9D8dhA5/Mk78Jw8CIq48s=";
   };
 
-  vendorHash = "sha256-uKzs+plk1W2S7iPv2J1Mi1Ff88+82zrIXLy2eTzD/Hc=";
+  vendorHash = "sha256-SfjHzYHJ+iat7pXhs8M8GBfyZy+RKetKnAsA2UhLJuM=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 9d47ed157cb0ff2bc81cd34759348529f014cb6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= <work@jlbribeiro.com>
Date: Wed, 9 Oct 2024 12:21:18 +0100
Subject: [PATCH 6/7] granted: 0.35.0 -> 0.35.1

Diff: https://github.com/common-fate/granted/compare/v0.35.0...v0.35.1
Changelog: https://github.com/common-fate/granted/releases/tag/v0.35.1
---
 pkgs/by-name/gr/granted/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index 743af20d1ba30..aff09975f5bea 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -15,16 +15,16 @@
 
 buildGoModule rec {
   pname = "granted";
-  version = "0.35.0";
+  version = "0.35.1";
 
   src = fetchFromGitHub {
     owner = "common-fate";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-0zFM7QH2JrYt7zakf1xj3F9D8dhA5/Mk78Jw8CIq48s=";
+    sha256 = "sha256-3DYPZbaMZsdbKXqrG4iLVasgfJQ0l1N+28qbYJieO6c=";
   };
 
-  vendorHash = "sha256-SfjHzYHJ+iat7pXhs8M8GBfyZy+RKetKnAsA2UhLJuM=";
+  vendorHash = "sha256-9aHzPZBgrQv/T9cT/0Xv3bgceMWCuD8YwsG4cN00heE=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 1cf977bad5975ed81c59b18c78dae15a67fab83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= <work@jlbribeiro.com>
Date: Mon, 21 Oct 2024 14:04:09 +0100
Subject: [PATCH 7/7] granted: 0.35.1 -> 0.35.2

Diff: https://github.com/common-fate/granted/compare/v0.35.1...v0.35.2
Changelog: https://github.com/common-fate/granted/releases/tag/v0.35.2
---
 pkgs/by-name/gr/granted/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/granted/package.nix b/pkgs/by-name/gr/granted/package.nix
index aff09975f5bea..307c245eb590b 100644
--- a/pkgs/by-name/gr/granted/package.nix
+++ b/pkgs/by-name/gr/granted/package.nix
@@ -15,16 +15,16 @@
 
 buildGoModule rec {
   pname = "granted";
-  version = "0.35.1";
+  version = "0.35.2";
 
   src = fetchFromGitHub {
     owner = "common-fate";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-3DYPZbaMZsdbKXqrG4iLVasgfJQ0l1N+28qbYJieO6c=";
+    sha256 = "sha256-8Ou1TkPGAsrRfV75ntPKpXTUEhVkwgtaXErrRX8hR0E=";
   };
 
-  vendorHash = "sha256-9aHzPZBgrQv/T9cT/0Xv3bgceMWCuD8YwsG4cN00heE=";
+  vendorHash = "sha256-XCq+hDxK7C9XYlKe+lUArQlPheWALx806o1IeCRD7vs=";
 
   nativeBuildInputs = [ makeWrapper ];