From 1b784e5f6f82efba3f7ff593ae642b8b59398da7 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:36 +0000 Subject: [PATCH] subversion: move defaults to package file --- .../version-management/subversion/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index a7f51713994..64e8e5d2d25 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -1,6 +1,6 @@ -{ bdbSupport ? false # build support for Berkeley DB repositories +{ bdbSupport ? true # build support for Berkeley DB repositories , httpServer ? false # build Apache DAV module -, httpSupport ? false # client must support http +, httpSupport ? true # client must support http , pythonBindings ? false , perlBindings ? false , javahlBindings ? false diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab21195a794..736d5cdd900 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19411,16 +19411,7 @@ in sublime3-dev = sublime3Packages.sublime3-dev; - inherit (callPackages ../applications/version-management/subversion { - bdbSupport = true; - httpServer = false; - httpSupport = true; - pythonBindings = false; - perlBindings = false; - javahlBindings = false; - saslSupport = false; - sasl = cyrus_sasl; - }) + inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) subversion18 subversion19 subversion_1_10 subversion_1_11; subversion = subversion_1_11;