public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kde4.kdesdk-kioslaves: fix by resurrecting svn-1.8

Browse Source 
Just bringing back pre-bc54ecd811e state as well.
This commit is contained in:
Vladimír Čunát 2015-10-01 22:22:31 +02:00
parent 14961c8781
commit e9fcbe67b0
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/version-management/subversion/default.nix
View File

@ -8,6 +8,7 @@
, stdenv, fetchurl, apr, aprutil, zlib, sqlite , stdenv, fetchurl, apr, aprutil, zlib, sqlite
, apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
, sasl ? null, serf ? null , sasl ? null, serf ? null
, branch ? "1.9"
}: }:
assert bdbSupport -> aprutil.bdbSupport; assert bdbSupport -> aprutil.bdbSupport;
@ -15,15 +16,26 @@ assert httpServer -> apacheHttpd != null;
assert pythonBindings -> swig != null && python != null; assert pythonBindings -> swig != null && python != null;
assert javahlBindings -> jdk != null && perl != 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 { stdenv.mkDerivation (rec {
version = "1.9.2"; version = "${branch}." + config.${branch}.ver_min;
name = "subversion-${version}"; name = "subversion-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://apache/subversion/${name}.tar.bz2"; url = "mirror://apache/subversion/${name}.tar.bz2";
sha1 = "fb9db3b7ddf48ae37aa8785872301b59bfcc7017"; inherit (config.${branch}) sha1;
}; };
buildInputs = [ zlib apr aprutil sqlite ] buildInputs = [ zlib apr aprutil sqlite ]

1
pkgs/top-level/all-packages.nix
View File

@ -13921,6 +13921,7 @@ let
libcanberra = libcanberra_kde; libcanberra = libcanberra_kde;
boost = boost155; boost = boost155;
kdelibs = kdeApps_15_08.kdelibs; kdelibs = kdeApps_15_08.kdelibs;
subversionClient = subversionClient.override { branch = "1.8"; };
} }
../desktops/kde-4.14; ../desktops/kde-4.14;