* Added assertions and defaults to the Subversion package.
* Some cleanups. svn path=/nixpkgs/trunk/; revision=482
This commit is contained in:
parent
4cf6ec5ef5
commit
4d037af2de
|
@ -1,6 +1,17 @@
|
|||
{ 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;
|
||||
|
|
|
@ -164,7 +164,6 @@
|
|||
httpd = apacheHttpd;
|
||||
db4 = db4;
|
||||
expat = expat;
|
||||
swig = "";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue