* Subversion 1.2.0; this is now the default.
svn path=/nixpkgs/trunk/; revision=3113
This commit is contained in:
parent
36716a35bd
commit
977f5183dd
|
@ -19,12 +19,12 @@ assert javahlBindings -> j2sdk != null;
|
||||||
assert compressionSupport -> zlib != null;
|
assert compressionSupport -> zlib != null;
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "subversion-1.2.0-pre-rc4";
|
name = "subversion-1.2.0";
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://subversion.tigris.org/downloads/subversion-1.2.0-rc4.tar.bz2;
|
url = http://subversion.tigris.org/downloads/subversion-1.2.0.tar.bz2;
|
||||||
md5 = "7913900ef3d92afcbdf63a3163574798";
|
md5 = "f25c0c884201f411e99a6cb6c25529ff";
|
||||||
};
|
};
|
||||||
|
|
||||||
# This is a hopefully temporary fix for the problem that
|
# This is a hopefully temporary fix for the problem that
|
||||||
|
|
|
@ -1037,7 +1037,7 @@ rec {
|
||||||
|
|
||||||
### APPLICATIONS
|
### APPLICATIONS
|
||||||
|
|
||||||
subversion = (import ../applications/version-management/subversion-1.1.x) {
|
subversion11x = (import ../applications/version-management/subversion-1.1.x) {
|
||||||
inherit fetchurl stdenv openssl db4 expat swig zlib;
|
inherit fetchurl stdenv openssl db4 expat swig zlib;
|
||||||
localServer = true;
|
localServer = true;
|
||||||
httpServer = false;
|
httpServer = false;
|
||||||
|
@ -1046,7 +1046,7 @@ rec {
|
||||||
httpd = apacheHttpd;
|
httpd = apacheHttpd;
|
||||||
};
|
};
|
||||||
|
|
||||||
subversion12x = (import ../applications/version-management/subversion-1.2.x) {
|
subversion = (import ../applications/version-management/subversion-1.2.x) {
|
||||||
inherit fetchurl stdenv openssl db4 expat swig zlib;
|
inherit fetchurl stdenv openssl db4 expat swig zlib;
|
||||||
localServer = true;
|
localServer = true;
|
||||||
httpServer = false;
|
httpServer = false;
|
||||||
|
@ -1055,7 +1055,7 @@ rec {
|
||||||
httpd = apacheHttpd;
|
httpd = apacheHttpd;
|
||||||
};
|
};
|
||||||
|
|
||||||
subversionWithJava = (import ../applications/version-management/subversion-1.1.x) {
|
subversionWithJava = (import ../applications/version-management/subversion-1.2.x) {
|
||||||
inherit fetchurl stdenv openssl db4 expat;
|
inherit fetchurl stdenv openssl db4 expat;
|
||||||
swig = swigWithJava;
|
swig = swigWithJava;
|
||||||
localServer = true;
|
localServer = true;
|
||||||
|
|
Loading…
Reference in a new issue