public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Marc Weber 2008-09-24 00:42:21 +00:00
parent 32e2dbf87f
commit 92fb53a1a5
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/version-management/subversion-1.4.x/svnmerge.nix
View File

@ -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";
};
}

6
pkgs/top-level/all-packages.nix
View File

@ -6780,8 +6780,6 @@ let
httpd = apacheHttpd; httpd = apacheHttpd;
}; };
subversion14svnmerge = svnmergeFun subversion14;
subversion15 = import ../applications/version-management/subversion-1.5.x { subversion15 = import ../applications/version-management/subversion-1.5.x {
inherit fetchurl stdenv apr aprutil expat swig zlib jdk; inherit fetchurl stdenv apr aprutil expat swig zlib jdk;
neon = neon028; neon = neon028;
@ -6798,10 +6796,6 @@ let
svk = perlSVK; 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 { sylpheed = import ../applications/networking/mailreaders/sylpheed {
inherit fetchurl stdenv pkgconfig openssl gpgme; inherit fetchurl stdenv pkgconfig openssl gpgme;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;