public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1437 from wkennington/subfix 

Subversion and Dependent Package Cleanup
This commit is contained in:
Michael Raskin 2013-12-31 06:46:01 -08:00
parent 515488790e 844ab16b90
commit 9203b12d2c
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/version-management/subversion/default.nix
View File

@ -1,13 +1,11 @@
{ bdbSupport ? false # build support for Berkeley DB repositories { bdbSupport ? false # build support for Berkeley DB repositories
, httpServer ? false # build Apache DAV module , httpServer ? false # build Apache DAV module
, httpSupport ? false # client must support http , httpSupport ? false # client must support http
, sslSupport ? false # client must support https
, compressionSupport ? false # client must support http compression
, pythonBindings ? false , pythonBindings ? false
, perlBindings ? false , perlBindings ? false
, javahlBindings ? false , javahlBindings ? false
, saslSupport ? false , saslSupport ? false
, stdenv, fetchurl, apr, aprutil, neon, zlib, sqlite , stdenv, fetchurl, apr, aprutil, zlib, sqlite
, httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
, sasl ? null, serf ? null , sasl ? null, serf ? null
}: }:
@ -16,8 +14,6 @@ assert bdbSupport -> aprutil.bdbSupport;
assert httpServer -> httpd != null; assert httpServer -> httpd != null;
assert pythonBindings -> swig != null && python != null; assert pythonBindings -> swig != null && python != null;
assert javahlBindings -> jdk != null && perl != null; assert javahlBindings -> jdk != null && perl != null;
assert sslSupport -> neon.sslSupport;
assert compressionSupport -> neon.compressionSupport;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -31,7 +27,6 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ zlib apr aprutil sqlite ] buildInputs = [ zlib apr aprutil sqlite ]
++ stdenv.lib.optional httpSupport neon
++ stdenv.lib.optional httpSupport serf ++ stdenv.lib.optional httpSupport serf
++ stdenv.lib.optional pythonBindings python ++ stdenv.lib.optional pythonBindings python
++ stdenv.lib.optional perlBindings perl ++ stdenv.lib.optional perlBindings perl

16
pkgs/development/libraries/apr-util/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, apr, expat { stdenv, fetchurl, makeWrapper, apr, expat, gnused
, sslSupport ? true, openssl , sslSupport ? true, openssl
, bdbSupport ? false, db4 , bdbSupport ? false, db4
, ldapSupport ? true, openldap , ldapSupport ? true, openldap
@ -8,6 +8,10 @@ assert sslSupport -> openssl != null;
assert bdbSupport -> db4 != null; assert bdbSupport -> db4 != null;
assert ldapSupport -> openldap != null; assert ldapSupport -> openldap != null;
let
optional = stdenv.lib.optional;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "apr-util-1.5.3"; name = "apr-util-1.5.3";
@ -24,7 +28,15 @@ stdenv.mkDerivation rec {
${stdenv.lib.optionalString ldapSupport "--with-ldap"} ${stdenv.lib.optionalString ldapSupport "--with-ldap"}
''; '';
propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap; propagatedBuildInputs = [ makeWrapper apr expat ]
++ optional sslSupport openssl
++ optional bdbSupport db4
++ optional ldapSupport openldap;
# Give apr1 access to sed for runtime invocations
postInstall = ''
wrapProgram $out/bin/apu-1-config --prefix PATH : "${gnused}/bin"
'';
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/top-level/all-packages.nix
View File

@ -8887,12 +8887,10 @@ let
bdbSupport = true; bdbSupport = true;
httpServer = false; httpServer = false;
httpSupport = true; httpSupport = true;
sslSupport = true;
pythonBindings = false; pythonBindings = false;
perlBindings = false; perlBindings = false;
javahlBindings = false; javahlBindings = false;
saslSupport = false; saslSupport = false;
compressionSupport = true;
httpd = apacheHttpd; httpd = apacheHttpd;
sasl = cyrus_sasl; sasl = cyrus_sasl;
}; };