summary refs log tree commit diff
path: root/pkgs/applications/version-management/git-and-tools/git-imerge
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2015-04-08 14:03:14 -0500
committerJohn Wiegley <johnw@newartisans.com>2015-04-08 14:03:14 -0500
commitaec35dfa58192146a9048a559bb9b160d3ad4a36 (patch)
treeef8d8254ac5db5a020afd912d0caf7b22827ced1 /pkgs/applications/version-management/git-and-tools/git-imerge
parent34a8b2ee4828dc52e7c0aed66b9b8e545dc8f43a (diff)
downloadnixlib-aec35dfa58192146a9048a559bb9b160d3ad4a36.tar
nixlib-aec35dfa58192146a9048a559bb9b160d3ad4a36.tar.gz
nixlib-aec35dfa58192146a9048a559bb9b160d3ad4a36.tar.bz2
nixlib-aec35dfa58192146a9048a559bb9b160d3ad4a36.tar.lz
nixlib-aec35dfa58192146a9048a559bb9b160d3ad4a36.tar.xz
nixlib-aec35dfa58192146a9048a559bb9b160d3ad4a36.tar.zst
nixlib-aec35dfa58192146a9048a559bb9b160d3ad4a36.zip
Revert "git-imerge: new package"
This reverts commit 309d0f0c8b6664241d3bf5692f4463333f2c85e6.
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/git-imerge')
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-imerge/default.nix26
1 files changed, 0 insertions, 26 deletions
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
deleted file mode 100644
index de3041806859..000000000000
--- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  name = "git-imerge-${version}";
-  version = "0.7.0";
-
-  src = fetchFromGitHub {
-    repo = "git-imerge";
-    owner = "mhagger";
-    rev = version;
-    sha256 = "09czjxgjbby54jx1v5m825k87v8g9g374hwv0r6ss48kv1ipvakq";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bin
-    make install PREFIX=$out
-  '';
-
-  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 ];
-  };
-}