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

added svnmerge.py contrib tool

Browse Source 
svn path=/nixpkgs/trunk/; revision=11075
This commit is contained in:
Marc Weber 2008-03-12 10:36:15 +00:00
parent 5693576572
commit 8939f24475
2 changed files with 27 additions and 0 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 Normal file
View File

@ -0,0 +1,22 @@
{subversion, stdenv, python, shebangfix }:
stdenv.mkDerivation {
name = "${subversion.name}-svnmerge";
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";
};
}

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

@ -5384,6 +5384,7 @@ rec {
compressionSupport = getConfig ["subversion" "compressionSupport"] true; compressionSupport = getConfig ["subversion" "compressionSupport"] true;
httpd = apacheHttpd; httpd = apacheHttpd;
}; };
subversion14svnmerge = svnmergeFun subversion14;
subversionWithJava = import ../applications/version-management/subversion-1.2.x { subversionWithJava = import ../applications/version-management/subversion-1.2.x {
inherit fetchurl stdenv openssl db4 expat jdk; inherit fetchurl stdenv openssl db4 expat jdk;
@ -5395,6 +5396,10 @@ rec {
javahlBindings = true; javahlBindings = true;
}; };
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;