diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
| commit | 741bf840dad05cd1728481045466811ae8ae8281 (patch) | |
| tree | 93ce9aef00773772dfb9b782f20e20b79f024d48 /pkgs/applications/version-management/subversion | |
| parent | fe195af94462a6769f2e2c38c1d5739337c20d57 (diff) | |
| download | nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.gz nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.bz2 nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.lz nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.xz nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.tar.zst nixpkgs-741bf840dad05cd1728481045466811ae8ae8281.zip | |
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb. Conflicts: pkgs/development/libraries/ncurses/default.nix
Diffstat (limited to 'pkgs/applications/version-management/subversion')
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index f563bebd9db..db29360c9ec 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -8,7 +8,6 @@ , 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; @@ -16,26 +15,15 @@ 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 = "${branch}." + config.${branch}.ver_min; + version = "1.9.2"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - inherit (config.${branch}) sha1; + sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; }; buildInputs = [ zlib apr aprutil sqlite ] |