From 5935b3e142b1b473fe89c5e875760c81d8e965e8 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 26 Jun 2025 18:28:46 +0200 Subject: [PATCH 1/6] git-sync: 0-unstable-2024-11-30 -> 0-unstable-2025-06-26 --- pkgs/by-name/gi/git-sync/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-sync/package.nix b/pkgs/by-name/gi/git-sync/package.nix index 3b4f43dc1f23..096dc6bb269c 100644 --- a/pkgs/by-name/gi/git-sync/package.nix +++ b/pkgs/by-name/gi/git-sync/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "git-sync"; - version = "0-unstable-2024-11-30"; + version = "0-unstable-2025-06-26"; src = fetchFromGitHub { owner = "simonthum"; repo = "git-sync"; - rev = "7242291edf543ecc1bb9de8f47086bb69a5cb9f7"; - hash = "sha256-t1NVgp+ELmTMK0N1fFFJCoKQd8mSYSMAIDG9+kNs3Ok="; + rev = "15af8a43cb4d8354f0b7e7c8d27e09587a9a3994"; + hash = "sha256-7sCncPxVMiDGi1PSoFhA9emSY2Jit35/FaBbinCdS/A="; }; nativeBuildInputs = [ makeWrapper ]; From 8a03e3479ff8f675a20dc9e4482d27830d991108 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 26 Jun 2025 18:29:56 +0200 Subject: [PATCH 2/6] git-sync: use `makeBinaryWrapper` --- pkgs/by-name/gi/git-sync/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-sync/package.nix b/pkgs/by-name/gi/git-sync/package.nix index 096dc6bb269c..338d55af2fad 100644 --- a/pkgs/by-name/gi/git-sync/package.nix +++ b/pkgs/by-name/gi/git-sync/package.nix @@ -6,7 +6,7 @@ git, gnugrep, gnused, - makeWrapper, + makeBinaryWrapper, inotify-tools, nix-update-script, }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hash = "sha256-7sCncPxVMiDGi1PSoFhA9emSY2Jit35/FaBbinCdS/A="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; dontBuild = true; From 2fbbba5004862d84e449ee1a49deb292cfbd0365 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 26 Jun 2025 18:38:36 +0200 Subject: [PATCH 3/6] git-sync: add `fswatch` for `git-sync-on-fswatch` --- pkgs/by-name/gi/git-sync/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/gi/git-sync/package.nix b/pkgs/by-name/gi/git-sync/package.nix index 338d55af2fad..78a17dea1a0c 100644 --- a/pkgs/by-name/gi/git-sync/package.nix +++ b/pkgs/by-name/gi/git-sync/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, coreutils, + fswatch, git, gnugrep, gnused, @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { wrapperPath = lib.makeBinPath ( [ coreutils + fswatch git gnugrep gnused From cdb5e6e881ab6c3e04d34d2af1f19ae27b32464b Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 26 Jun 2025 18:39:25 +0200 Subject: [PATCH 4/6] git-sync: refactor `installPhase` --- pkgs/by-name/gi/git-sync/package.nix | 52 ++++++++++++++++------------ 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/gi/git-sync/package.nix b/pkgs/by-name/gi/git-sync/package.nix index 78a17dea1a0c..a8bedbd66bba 100644 --- a/pkgs/by-name/gi/git-sync/package.nix +++ b/pkgs/by-name/gi/git-sync/package.nix @@ -27,32 +27,40 @@ stdenv.mkDerivation rec { dontBuild = true; - installPhase = '' - mkdir -p $out/bin - cp -a git-* $out/bin/ - cp -a contrib/git-* $out/bin/ - ''; + installPhase = + let + wrapperPath = lib.makeBinPath ( + [ + coreutils + fswatch + git + gnugrep + gnused + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ] + ); - wrapperPath = lib.makeBinPath ( - [ - coreutils - fswatch - git - gnugrep - gnused - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ] - ); + in + '' + runHook preInstall - postFixup = '' - wrap_path="${wrapperPath}":$out/bin + for file in git-*; do + install -D -m 755 "$file" -t $out/bin + done - wrapProgram $out/bin/git-sync \ - --prefix PATH : $wrap_path + for file in contrib/git-*; do + install -D -m 755 "$file" -t $out/bin + done - wrapProgram $out/bin/git-sync-on-inotify \ - --prefix PATH : $wrap_path - ''; + wrap_path="${wrapperPath}":$out/bin + + for file in $out/bin/*; do + wrapProgram $file \ + --prefix PATH : $wrap_path + done + + runHook postInstall + ''; passthru = { updateScript = nix-update-script { }; From 43823a262a50cd98a29859eebdaeb591f869c324 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 26 Jun 2025 18:45:06 +0200 Subject: [PATCH 5/6] git-sync: remove obsolete `rec` keyword --- pkgs/by-name/gi/git-sync/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/git-sync/package.nix b/pkgs/by-name/gi/git-sync/package.nix index a8bedbd66bba..99a88571d426 100644 --- a/pkgs/by-name/gi/git-sync/package.nix +++ b/pkgs/by-name/gi/git-sync/package.nix @@ -12,7 +12,7 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "git-sync"; version = "0-unstable-2025-06-26"; From 10c1d20f48e00411fdacb0f40d80dd9e09610898 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 26 Jun 2025 18:45:37 +0200 Subject: [PATCH 6/6] git-sync: replace `git` with `gitMinimal` --- pkgs/by-name/gi/git-sync/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-sync/package.nix b/pkgs/by-name/gi/git-sync/package.nix index 99a88571d426..5f0f274d88ea 100644 --- a/pkgs/by-name/gi/git-sync/package.nix +++ b/pkgs/by-name/gi/git-sync/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, coreutils, fswatch, - git, + gitMinimal, gnugrep, gnused, makeBinaryWrapper, @@ -33,7 +33,7 @@ stdenv.mkDerivation { [ coreutils fswatch - git + gitMinimal gnugrep gnused ]