From 92fb53a1a57c251e755e001d77d47654125cbecf Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 24 Sep 2008 00:42:21 +0000
Subject: [PATCH] removed subversion14merge I don't think anyone is still using
 it everyone caring about merging is using git or such anyway and subversion15
 has support built in.

svn path=/nixpkgs/trunk/; revision=12905
---
 .../subversion-1.4.x/svnmerge.nix             | 22 -------------------
 pkgs/top-level/all-packages.nix               |  6 -----
 2 files changed, 28 deletions(-)
 delete mode 100644 pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix

diff --git a/pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix b/pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix
deleted file mode 100644
index 9c8b0349f4a8..000000000000
--- a/pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{subversion, stdenv, python, shebangfix }:
-stdenv.mkDerivation {
-  name = "svnmerge-${subversion.version}";
-
-  src = subversion.src;
-
-  phases = "unpackPhase buildPhase";
-
-  buildInputs = [ shebangfix python ];
-
-  buildPhase = "
-    ensureDir \$out/bin
-    t=\$out/bin/svnmerge.py
-    cp contrib/client-side/svnmerge.py \$t
-    chmod +x \$t
-    shebangfix  \$t
-  ";
-
-  meta = subversion.meta // { 
-      description = "installs the contrib tool svnmerge.py";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0d843213fb2..2a43e9843c89 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6780,8 +6780,6 @@ let
     httpd = apacheHttpd;
   };
 
-  subversion14svnmerge = svnmergeFun subversion14;
-
   subversion15 = import ../applications/version-management/subversion-1.5.x {
     inherit fetchurl stdenv apr aprutil expat swig zlib jdk;
     neon = neon028;
@@ -6798,10 +6796,6 @@ let
 
   svk = perlSVK;
 
-  svnmergeFun = subversion : (import ../applications/version-management/subversion-1.4.x/svnmerge.nix ) {
-    inherit subversion stdenv shebangfix python;
-  };
-
   sylpheed = import ../applications/networking/mailreaders/sylpheed {
     inherit fetchurl stdenv pkgconfig openssl gpgme;
     inherit (gtkLibs) gtk;