subversion: Use callPackages

This commit is contained in:
Eelco Dolstra
2015-12-16 15:17:00 +01:00
parent 35f8952a8c
commit 64792ffdaa
2 changed files with 93 additions and 83 deletions

View File

@@ -13217,18 +13217,21 @@ let
sublime3 = lowPrio (callPackage ../applications/editors/sublime3 { });
subversion = callPackage ../applications/version-management/subversion/default.nix {
bdbSupport = true;
httpServer = false;
httpSupport = true;
pythonBindings = false;
perlBindings = false;
javahlBindings = false;
saslSupport = false;
sasl = cyrus_sasl;
};
inherit (callPackages ../applications/version-management/subversion/default.nix {
bdbSupport = true;
httpServer = false;
httpSupport = true;
pythonBindings = false;
perlBindings = false;
javahlBindings = false;
saslSupport = false;
sasl = cyrus_sasl;
})
subversion18 subversion19;
subversionClient = appendToName "client" (subversion.override {
subversion = pkgs.subversion19;
subversionClient = appendToName "client" (pkgs.subversion.override {
bdbSupport = false;
perlBindings = true;
pythonBindings = true;
@@ -14527,7 +14530,11 @@ let
libcanberra = libcanberra_kde;
boost = boost155;
kdelibs = kdeApps_15_08.kdelibs;
subversionClient = subversionClient.override { branch = "1.8"; };
subversionClient = pkgs.subversion18.override {
bdbSupport = false;
perlBindings = true;
pythonBindings = true;
};
}
../desktops/kde-4.14;