* Added assertions and defaults to the Subversion package.

* Some cleanups.

svn path=/nixpkgs/trunk/; revision=482
This commit is contained in:
Eelco Dolstra 2003-11-05 16:28:26 +00:00
parent 4cf6ec5ef5
commit 4d037af2de
7 changed files with 32 additions and 22 deletions

View file

@ -1,15 +1,26 @@
{ stdenv, fetchurl, openssl, httpd, db4, expat, swig
, localServer, httpServer, sslSupport, swigBindings
}:
{ localServer ? false
, httpServer ? false
, sslSupport ? false
, swigBindings ? false
, stdenv, fetchurl
, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null
}:
assert !isNull expat;
assert localServer -> !isNull db4;
assert httpServer -> !isNull httpd && httpd.expat == expat;
assert sslSupport -> !isNull openssl && (httpServer -> httpd.openssl == openssl);
assert swigBindings -> !isNull swig;
derivation {
name = "subversion-0.32.1";
system = stdenv.system;
builder = ./builder.sh;
src = fetchurl {
url = http://svn.collab.net/tarballs/subversion-0.32.1.tar.gz;
md5 = "b06717a8ef50db4b5c4d380af00bd901";
};
url = http://svn.collab.net/tarballs/subversion-0.32.1.tar.gz;
md5 = "b06717a8ef50db4b5c4d380af00bd901";
};
localServer = localServer;
httpServer = httpServer;

View file

@ -3,8 +3,8 @@
system = stdenv.system;
builder = ./builder.sh;
src = fetchurl {
url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz;
md5 = "853474e4bcf4a85f7d38a0676b36bded";
};
url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz;
md5 = "853474e4bcf4a85f7d38a0676b36bded";
};
stdenv = stdenv;
}

View file

@ -3,8 +3,8 @@
system = stdenv.system;
builder = ./builder.sh;
src = fetchurl {
url = http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz;
md5 = "12262c64fcd64b772e7cffad8e4d0ebc";
};
url = http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz;
md5 = "12262c64fcd64b772e7cffad8e4d0ebc";
};
stdenv = stdenv;
}

View file

@ -3,8 +3,8 @@
system = stdenv.system;
builder = ./builder.sh;
src = fetchurl {
url = http://heanet.dl.sourceforge.net/sourceforge/expat/expat-1.95.7.tar.gz;
md5 = "2ff59c2a5cbdd21a285c5f343e214fa9";
};
url = http://heanet.dl.sourceforge.net/sourceforge/expat/expat-1.95.7.tar.gz;
md5 = "2ff59c2a5cbdd21a285c5f343e214fa9";
};
stdenv = stdenv;
}

View file

@ -7,9 +7,9 @@ derivation {
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp.cs.uu.nl/mirror/apache.org/dist/httpd/httpd-2.0.48.tar.gz;
md5 = "466c63bb71b710d20a5c353df8c1a19c";
};
url = ftp://ftp.cs.uu.nl/mirror/apache.org/dist/httpd/httpd-2.0.48.tar.gz;
md5 = "466c63bb71b710d20a5c353df8c1a19c";
};
stdenv = stdenv;
perl = perl;

View file

@ -164,7 +164,6 @@
httpd = apacheHttpd;
db4 = db4;
expat = expat;
swig = "";
};
}

View file

@ -3,8 +3,8 @@
system = stdenv.system;
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp.nluug.nl/pub/gnu/wget/wget-1.9.tar.gz;
md5 = "18ac093db70801b210152dd69b4ef08a";
};
url = ftp://ftp.nluug.nl/pub/gnu/wget/wget-1.9.tar.gz;
md5 = "18ac093db70801b210152dd69b4ef08a";
};
stdenv = stdenv;
}