diff options
author | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:39:32 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:39:32 -0800 |
commit | 453f7c7218dfb5788f91f9cecae4a4d3cf650af6 (patch) | |
tree | bd3f745c9487b6e8d786fc80b5ab5066c0360cb3 /pkgs/applications/version-management/subversion/default.nix | |
parent | fc8562c78590f269d9bf35f64ec21bdc5b3612c5 (diff) | |
parent | 6e18a33183006514021f63baebb78a502bdff8aa (diff) | |
download | nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.gz nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.bz2 nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.lz nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.xz nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.tar.zst nixlib-453f7c7218dfb5788f91f9cecae4a4d3cf650af6.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/applications/version-management/subversion/default.nix')
-rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 16 |
1 files changed, 14 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 ] |