From 943fd93c14d4f54fd38ea95c53a5bd2108c57f67 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Tue, 7 Apr 2015 00:38:20 -0400
Subject: git-imerge: new package

---
 .../git-and-tools/git-imerge/default.nix           | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-imerge/default.nix

(limited to 'pkgs/applications/version-management/git-and-tools/git-imerge')

diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
new file mode 100644
index 000000000000..91180b33cde9
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name = "git-imerge-${version}";
+  version = "0.7.0";
+
+  src = fetchurl {
+    url = "https://github.com/mhagger/git-imerge/archive/${version}.tar.gz";
+    sha256 = "00nwn3rfhf15wsv01lfji5412d7yz827ric916lnyp662d6gx206";
+  };
+
+  buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    make install PREFIX=$out
+    wrapPythonPrograms
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mhagger/git-imerge;
+    description = "Perform a merge between two branches incrementally";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = [ maintainers.spwhitt ];
+  };
+}
-- 
cgit 1.4.1