From 2654e2a0eda6ccba38b00191097c7aa3110f6900 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 22 Feb 2025 10:26:50 +0800
Subject: [PATCH 1/2] git-workspace: refactor

---
 pkgs/by-name/gi/git-workspace/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gi/git-workspace/package.nix b/pkgs/by-name/gi/git-workspace/package.nix
index e09edde9d9eb..c22b4413ec76 100644
--- a/pkgs/by-name/gi/git-workspace/package.nix
+++ b/pkgs/by-name/gi/git-workspace/package.nix
@@ -13,9 +13,9 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "orf";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-sS452PCX2G49Q5tnScG+ySkUAhFctGsGZrMvQXL7WkY=";
+    repo = "git-workspace";
+    tag = "v${version}";
+    hash = "sha256-sS452PCX2G49Q5tnScG+ySkUAhFctGsGZrMvQXL7WkY=";
   };
 
   useFetchCargoVendor = true;
@@ -27,11 +27,11 @@ rustPlatform.buildRustPackage rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Sync personal and work git repositories from multiple providers";
     homepage = "https://github.com/orf/git-workspace";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ misuzu ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ misuzu ];
     mainProgram = "git-workspace";
   };
 }

From 50bd78f8b75bab99cf81776fd767ee636eca759f Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 22 Feb 2025 19:03:32 +0800
Subject: [PATCH 2/2] git-workspace: 1.8.0 -> 1.9.0

---
 pkgs/by-name/gi/git-workspace/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/git-workspace/package.nix b/pkgs/by-name/gi/git-workspace/package.nix
index c22b4413ec76..efab397d2f5f 100644
--- a/pkgs/by-name/gi/git-workspace/package.nix
+++ b/pkgs/by-name/gi/git-workspace/package.nix
@@ -9,22 +9,30 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-workspace";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "orf";
     repo = "git-workspace";
     tag = "v${version}";
-    hash = "sha256-sS452PCX2G49Q5tnScG+ySkUAhFctGsGZrMvQXL7WkY=";
+    hash = "sha256-SeE8O48lzqJSg8rfmIgsUcGPbquo2OvK3OUUBG21ksc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-iYT45iqKmx+t+xImbQuSv/nAvaiLNrLLqbe8zKAF4Jw=";
+  cargoHash = "sha256-CaHZivayZNuCi8vID8Qr5j/Ed+GGdNu+7NznvsCb3j0=";
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ];
 
+  checkFlags = [
+    # integration tests, need docker
+    # https://rust.testcontainers.org/system_requirements/docker/
+    "--skip=test_archive_command"
+    "--skip=test_fetch_and_run_commands"
+    "--skip=test_update_command"
+  ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {