mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 04:43:09 +03:00
* Subversion 1.0.8 and 1.1.0.
svn path=/nixpkgs/trunk/; revision=1533
This commit is contained in:
parent
50d021364a
commit
8cb8bdd418
@ -13,12 +13,12 @@ assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl)
|
||||
assert swigBindings -> swig != null && swig.pythonSupport;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "subversion-1.0.6";
|
||||
name = "subversion-1.0.8";
|
||||
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = http://subversion.tigris.org/tarballs/subversion-1.0.6.tar.bz2;
|
||||
md5 = "bb05fe041fef7491b3555904d97f5e1c";
|
||||
url = http://subversion.tigris.org/tarballs/subversion-1.0.8.tar.bz2;
|
||||
md5 = "b2378b7d9d00653249877531a61ef1db";
|
||||
};
|
||||
|
||||
openssl = if sslSupport then openssl else null;
|
@ -15,12 +15,12 @@ assert pythonBindings -> swig != null && swig.pythonSupport;
|
||||
assert javaBindings -> swig != null && swig.javaSupport;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "subversion-1.1.0pre-rc2";
|
||||
name = "subversion-1.1.0";
|
||||
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = http://subversion.tigris.org/tarballs/subversion-1.1.0-rc2.tar.bz2;
|
||||
md5 = "ecd53e9f065739023da768891b83b70e";
|
||||
url = http://subversion.tigris.org/tarballs/subversion-1.1.0.tar.bz2;
|
||||
md5 = "a91b0d79b8c8ab8747587037c044c6c9";
|
||||
};
|
||||
|
||||
# This is a hopefully temporary fix for the problem that
|
@ -758,7 +758,7 @@ rec {
|
||||
|
||||
### APPLICATIONS
|
||||
|
||||
subversion = (import ../applications/version-management/subversion) {
|
||||
subversion = (import ../applications/version-management/subversion-1.0.x) {
|
||||
inherit fetchurl stdenv openssl db4 expat swig;
|
||||
localServer = true;
|
||||
httpServer = false;
|
||||
@ -766,7 +766,7 @@ rec {
|
||||
httpd = apacheHttpd;
|
||||
};
|
||||
|
||||
subversionWithJava = (import ../applications/version-management/subversion-1.1rc) {
|
||||
subversionWithJava = (import ../applications/version-management/subversion-1.1.x) {
|
||||
inherit fetchurl stdenv openssl db4 expat;
|
||||
swig = swigWithJava;
|
||||
localServer = true;
|
||||
|
Loading…
Reference in New Issue
Block a user