From 4d037af2de11dd3ac30d845f290edcac79302c05 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 5 Nov 2003 16:28:26 +0000 Subject: [PATCH] * Added assertions and defaults to the Subversion package. * Some cleanups. svn path=/nixpkgs/trunk/; revision=482 --- .../version-management/subversion/default.fix | 23 ++++++++++++++----- .../development/libraries/aterm/default.fix | 6 ++--- pkgs-ng/development/libraries/db4/default.fix | 6 ++--- .../development/libraries/expat/default.fix | 6 ++--- pkgs-ng/servers/http/apache-httpd/default.fix | 6 ++--- pkgs-ng/system/all-packages-generic.fix | 1 - pkgs-ng/tools/networking/wget/default.fix | 6 ++--- 7 files changed, 32 insertions(+), 22 deletions(-) diff --git a/pkgs-ng/applications/version-management/subversion/default.fix b/pkgs-ng/applications/version-management/subversion/default.fix index 853cb0d9014..beea8722e3d 100644 --- a/pkgs-ng/applications/version-management/subversion/default.fix +++ b/pkgs-ng/applications/version-management/subversion/default.fix @@ -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; diff --git a/pkgs-ng/development/libraries/aterm/default.fix b/pkgs-ng/development/libraries/aterm/default.fix index e4b5c10d93e..56b4c265ec0 100644 --- a/pkgs-ng/development/libraries/aterm/default.fix +++ b/pkgs-ng/development/libraries/aterm/default.fix @@ -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; } diff --git a/pkgs-ng/development/libraries/db4/default.fix b/pkgs-ng/development/libraries/db4/default.fix index a0a8b3653a0..06974133ce9 100644 --- a/pkgs-ng/development/libraries/db4/default.fix +++ b/pkgs-ng/development/libraries/db4/default.fix @@ -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; } diff --git a/pkgs-ng/development/libraries/expat/default.fix b/pkgs-ng/development/libraries/expat/default.fix index 7506c0b19d2..77b025b739f 100644 --- a/pkgs-ng/development/libraries/expat/default.fix +++ b/pkgs-ng/development/libraries/expat/default.fix @@ -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; } diff --git a/pkgs-ng/servers/http/apache-httpd/default.fix b/pkgs-ng/servers/http/apache-httpd/default.fix index e188b711563..b0e9dd2e9c0 100644 --- a/pkgs-ng/servers/http/apache-httpd/default.fix +++ b/pkgs-ng/servers/http/apache-httpd/default.fix @@ -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; diff --git a/pkgs-ng/system/all-packages-generic.fix b/pkgs-ng/system/all-packages-generic.fix index dd4a3a9d443..ff3eb263d32 100644 --- a/pkgs-ng/system/all-packages-generic.fix +++ b/pkgs-ng/system/all-packages-generic.fix @@ -164,7 +164,6 @@ httpd = apacheHttpd; db4 = db4; expat = expat; - swig = ""; }; } diff --git a/pkgs-ng/tools/networking/wget/default.fix b/pkgs-ng/tools/networking/wget/default.fix index 259f7dfa62d..d0b7d01c1de 100644 --- a/pkgs-ng/tools/networking/wget/default.fix +++ b/pkgs-ng/tools/networking/wget/default.fix @@ -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; }