From ef37ea7fe8026551fa597ffd89bd24e55dd29804 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 17 Jul 2021 22:47:43 -0600 Subject: [PATCH 1/3] git-sync: Wrap both binaries (cherry picked from commit 633993eee29d4a0092ea12b58741c108718a7308) --- .../version-management/git-and-tools/git-sync/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index add7bfc5526..7683feb8cf4 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -31,8 +31,13 @@ stdenv.mkDerivation rec { fixupPhase = '' patchShebangs $out/bin + wrap_path="${wrapperPath}":$out/bin + wrapProgram $out/bin/git-sync \ - --prefix PATH : "${wrapperPath}" + --prefix PATH : $wrap_path + + wrapProgram $out/bin/git-sync-on-inotify \ + --prefix PATH : $wrap_path ''; meta = { From ff0fa5554330fe0b0c83b140342d5e80a2dbb52a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 18 Jul 2021 13:01:56 +0200 Subject: [PATCH 2/3] git-sync: use postFixup instead of fixupPhase (cherry picked from commit d804b24b6be14c2d264b7381e32d02401fef3327) --- .../version-management/git-and-tools/git-sync/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index 7683feb8cf4..68a5c9cd87b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -28,9 +28,7 @@ stdenv.mkDerivation rec { gnused ]; - fixupPhase = '' - patchShebangs $out/bin - + postFixup = '' wrap_path="${wrapperPath}":$out/bin wrapProgram $out/bin/git-sync \ From 54b8add427d2fae519aade97c61d222f75b8aaee Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 15 Jul 2021 16:04:43 -0600 Subject: [PATCH 3/3] git-sync: unstable-2015-10-24 -> unstable-2021-07-14 (#130306) Co-authored-by: Sandro --- .../git-and-tools/git-sync/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index 68a5c9cd87b..14696903542 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git -}: +{ lib, stdenv, fetchFromGitHub, coreutils, git, gnugrep, gnused, makeWrapper, inotify-tools }: stdenv.mkDerivation rec { pname = "git-sync"; - version = "20151024"; + version = "unstable-2021-07-14"; src = fetchFromGitHub { owner = "simonthum"; repo = "git-sync"; - rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7"; - sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz"; + rev = "7d3d34bf3ee2483fba00948f5b97f964b849a590"; + sha256 = "sha256-PuYREW5NBkYF1tlcLTbOI8570nvHn5ifN8OIInfNNxI="; }; nativeBuildInputs = [ makeWrapper ]; @@ -18,10 +17,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -a git-sync $out/bin/git-sync + cp -a git-* $out/bin/ ''; wrapperPath = with lib; makeBinPath [ + inotify-tools coreutils git gnugrep