diff options
| author | Artturi <Artturin@artturin.com> | 2021-08-13 17:33:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 17:33:30 +0300 |
| commit | a445f5829889959d65ad65e5c961d5c67e1cd677 (patch) | |
| tree | 4a56cf50e16e9b4ceb84ec3a9f8325d8c1f61e15 | |
| parent | Merge pull request #133748 from NixOS/backport-133619-to-release-21.05 (diff) | |
| parent | git-sync: unstable-2015-10-24 -> unstable-2021-07-14 (#130306) (diff) | |
| download | nixpkgs-a445f5829889959d65ad65e5c961d5c67e1cd677.tar.gz | |
Merge pull request #133654 from Artturin/backport-130515
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-sync/default.nix | 21 |
1 files changed, 12 insertions, 9 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 add7bfc5526f..14696903542b 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,21 +17,25 @@ 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 gnused ]; - fixupPhase = '' - patchShebangs $out/bin + postFixup = '' + 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 = { |