From 53138130f837540d6a4f1de84f9c2527c61e2029 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 11 Jun 2018 19:21:51 -0700
Subject: git-sync: init at 20151024

---
 .../git-and-tools/git-sync/default.nix             | 45 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                    |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-sync/default.nix

(limited to 'pkgs')

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
new file mode 100644
index 000000000000..7ba7d8ec2434
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git
+}:
+
+stdenv.mkDerivation rec {
+  name = "git-sync-${version}";
+  version = "20151024";
+
+  src = fetchFromGitHub {
+    owner = "simonthum";
+    repo = "git-sync";
+    rev = "eb9adaf2b5fd65aac1e83d6544b9076aae6af5b7";
+    sha256 = "01if8y93wa0mwbkzkzx2v1vqh47zlz4k1dysl6yh5rmppd1psknz";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a git-sync $out/bin/git-sync
+  '';
+
+  wrapperPath = with stdenv.lib; makeBinPath [
+    coreutils
+    git
+    gnugrep
+    gnused
+  ];
+
+  fixupPhase = ''
+    patchShebangs $out/bin
+
+    wrapProgram $out/bin/git-sync \
+      --prefix PATH : "${wrapperPath}"
+  '';
+
+  meta = {
+    description = "A script to automatically synchronize a git repository";
+    homepage = https://github.com/simonthum/git-sync;
+    maintainers = with stdenv.lib.maintainers; [ imalison ];
+    license = stdenv.lib.licenses.cc0;
+    platforms = with stdenv.lib.platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2b28d0207d3..e9596e940e36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16106,6 +16106,8 @@ with pkgs;
     python = python27;
   };
 
+  git-sync = callPackage ../applications/version-management/git-and-tools/git-sync { };
+
   gitolite = callPackage ../applications/version-management/gitolite { };
 
   inherit (gnome3) gitg;
-- 
cgit 1.4.1


From 19ce96584a13482c2ae6d24cabeb3eb9c2b8b5cd Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Tue, 26 Jun 2018 12:33:18 +0200
Subject: git-sync: move to gitAndTools.git-sync

By convention, git-related tools in nixpkgs are not added to
the top level but bundled under gitAndTools.
---
 pkgs/applications/version-management/git-and-tools/default.nix | 2 ++
 pkgs/top-level/all-packages.nix                                | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 9a4ef524dde9..24da6a71c580 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -95,6 +95,8 @@ rec {
 
   git-stree = callPackage ./git-stree { };
 
+  git-sync = callPackage ./git-sync { };
+
   git2cl = callPackage ./git2cl { };
 
   gitFastExport = callPackage ./fast-export { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9596e940e36..e2b28d0207d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16106,8 +16106,6 @@ with pkgs;
     python = python27;
   };
 
-  git-sync = callPackage ../applications/version-management/git-and-tools/git-sync { };
-
   gitolite = callPackage ../applications/version-management/gitolite { };
 
   inherit (gnome3) gitg;
-- 
cgit 1.4.1