Skip to content

Subversion and Dependent Package Cleanup #1437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
7c6f434c merged 2 commits into from
Dec 31, 2013
Merged

Subversion and Dependent Package Cleanup #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
184dd19
subversion: Tweaks and Fixes
wkennington Dec 31, 2013
844ab16
apr-util: Cleanup
wkennington Dec 31, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions pkgs/applications/version-management/subversion/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{ bdbSupport ? false # build support for Berkeley DB repositories
, httpServer ? false # build Apache DAV module
, httpSupport ? false # client must support http
, sslSupport ? false # client must support https
, compressionSupport ? false # client must support http compression
, pythonBindings ? false
, perlBindings ? false
, javahlBindings ? 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
, sasl ? null, serf ? null
}:
Expand All @@ -16,8 +14,6 @@ assert bdbSupport -> aprutil.bdbSupport;
assert httpServer -> httpd != null;
assert pythonBindings -> swig != null && python != null;
assert javahlBindings -> jdk != null && perl != null;
assert sslSupport -> neon.sslSupport;
assert compressionSupport -> neon.compressionSupport;

stdenv.mkDerivation rec {

Expand All @@ -31,7 +27,6 @@ stdenv.mkDerivation rec {
};

buildInputs = [ zlib apr aprutil sqlite ]
++ stdenv.lib.optional httpSupport neon
++ stdenv.lib.optional httpSupport serf
++ stdenv.lib.optional pythonBindings python
++ stdenv.lib.optional perlBindings perl
Expand Down
16 changes: 14 additions & 2 deletions pkgs/development/libraries/apr-util/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, apr, expat
{ stdenv, fetchurl, makeWrapper, apr, expat, gnused
, sslSupport ? true, openssl
, bdbSupport ? false, db4
, ldapSupport ? true, openldap
Expand All @@ -8,6 +8,10 @@ assert sslSupport -> openssl != null;
assert bdbSupport -> db4 != null;
assert ldapSupport -> openldap != null;

let
optional = stdenv.lib.optional;
in

stdenv.mkDerivation rec {
name = "apr-util-1.5.3";

Expand All @@ -24,7 +28,15 @@ stdenv.mkDerivation rec {
${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;

Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8887,12 +8887,10 @@ let
bdbSupport = true;
httpServer = false;
httpSupport = true;
sslSupport = true;
pythonBindings = false;
perlBindings = false;
javahlBindings = false;
saslSupport = false;
compressionSupport = true;
httpd = apacheHttpd;
sasl = cyrus_sasl;
};
Expand Down