diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2008-03-12 10:36:15 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2008-03-12 10:36:15 +0000 |
| commit | 8939f24475d21d89d41b664556378fa709e14ff2 (patch) | |
| tree | 1ee8405e5ab88184c6bab1fd71da456d98d2c9ed /pkgs/top-level/all-packages.nix | |
| parent | 569357657223d5ebaea8eab73ba22ecf1050f7e2 (diff) | |
| download | nixpkgs-8939f24475d21d89d41b664556378fa709e14ff2.tar nixpkgs-8939f24475d21d89d41b664556378fa709e14ff2.tar.gz nixpkgs-8939f24475d21d89d41b664556378fa709e14ff2.tar.bz2 nixpkgs-8939f24475d21d89d41b664556378fa709e14ff2.tar.lz nixpkgs-8939f24475d21d89d41b664556378fa709e14ff2.tar.xz nixpkgs-8939f24475d21d89d41b664556378fa709e14ff2.tar.zst nixpkgs-8939f24475d21d89d41b664556378fa709e14ff2.zip | |
added svnmerge.py contrib tool
svn path=/nixpkgs/trunk/; revision=11075
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a71103d050..61a410a6eab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5384,6 +5384,7 @@ rec { compressionSupport = getConfig ["subversion" "compressionSupport"] true; httpd = apacheHttpd; }; + subversion14svnmerge = svnmergeFun subversion14; subversionWithJava = import ../applications/version-management/subversion-1.2.x { inherit fetchurl stdenv openssl db4 expat jdk; @@ -5395,6 +5396,10 @@ rec { 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 { inherit fetchurl stdenv pkgconfig openssl gpgme; inherit (gtkLibs) gtk; |