From 65ad55c425ddd3f6dea06f1b6a1c51e076179965 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 16:37:36 +0200
Subject: [PATCH] git-subtree: Remove

This package is obsolete because it's now part of git (see
https://github.com/apenwarr/git-subtree/blob/master/THIS-REPO-IS-OBSOLETE).
---
 .../git-and-tools/default.nix                 |  4 ---
 .../git-and-tools/git-subtree/default.nix     | 27 -------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/applications/version-management/git-and-tools/git-subtree/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 69aeba92fd8..b5b3d4044c5 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -89,9 +89,5 @@ rec {
 
   svn2git_kde = callPackage ./svn2git-kde { };
 
-  gitSubtree = import ./git-subtree {
-    inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt;
-  };
-
   darcsToGit = callPackage ./darcs-to-git { };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix
deleted file mode 100644
index dd00572b150..00000000000
--- a/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, git, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt }:
-
-stdenv.mkDerivation {
-  name = "git-subtree-0.4-2-g2793ee6";
-
-  src = fetchurl {
-    url = "http://github.com/apenwarr/git-subtree/tarball/2793ee6ba6da57d97e9c313741041f7eb2e88974";
-    sha256 = "33fdba315cf8846f45dff7622c1099c386db960c7b43d5d8fbb382fd4d1acff6";
-    name = "git-subtree-0.4-2-g2793ee6.tar.gz";
-  };
-
-  buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ];
-
-  configurePhase = "export prefix=$out";
-
-  buildPhase = "true";
-
-  installPhase = "make install prefix=$out gitdir=$out/bin";
-
-  meta= {
-    description = "experimental alternative to the git-submodule command";
-    homepage = http://github.com/apenwarr/git-subtree;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.gnu;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-  };
-}