diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-01 22:22:31 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-01 22:23:31 +0200 |
| commit | e9fcbe67b09fd21395e10a19b967f8add0127018 (patch) | |
| tree | cc9a3083a237ac28b4a09113aebce83526dc79f2 | |
| parent | 14961c87810330d22fc1ee11e11a17e32805ff8b (diff) | |
| download | nixlib-e9fcbe67b09fd21395e10a19b967f8add0127018.tar nixlib-e9fcbe67b09fd21395e10a19b967f8add0127018.tar.gz nixlib-e9fcbe67b09fd21395e10a19b967f8add0127018.tar.bz2 nixlib-e9fcbe67b09fd21395e10a19b967f8add0127018.tar.lz nixlib-e9fcbe67b09fd21395e10a19b967f8add0127018.tar.xz nixlib-e9fcbe67b09fd21395e10a19b967f8add0127018.tar.zst nixlib-e9fcbe67b09fd21395e10a19b967f8add0127018.zip | |
kde4.kdesdk-kioslaves: fix by resurrecting svn-1.8
Just bringing back pre-bc54ecd811e state as well.
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index db29360c9ecb..f563bebd9db8 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -8,6 +8,7 @@ , stdenv, fetchurl, apr, aprutil, zlib, sqlite , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , sasl ? null, serf ? null +, branch ? "1.9" }: assert bdbSupport -> aprutil.bdbSupport; @@ -15,15 +16,26 @@ assert httpServer -> apacheHttpd != null; assert pythonBindings -> swig != null && python != null; assert javahlBindings -> jdk != null && perl != null; +let + config = { + "1.9".ver_min = "2"; + "1.9".sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; + + "1.8".ver_min = "14"; + "1.8".sha1 = "0698efc58373e7657f6dd3ce13cab7b002ffb497"; + }; +in +assert builtins.hasAttr branch config; + stdenv.mkDerivation (rec { - version = "1.9.2"; + version = "${branch}." + config.${branch}.ver_min; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; + inherit (config.${branch}) sha1; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79862d8613aa..af8de26af19b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13921,6 +13921,7 @@ let libcanberra = libcanberra_kde; boost = boost155; kdelibs = kdeApps_15_08.kdelibs; + subversionClient = subversionClient.override { branch = "1.8"; }; } ../desktops/kde-4.14; |