diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-05-17 10:56:54 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-05-17 10:56:54 +0000 |
commit | c1d22074139ab0d048a05b5e5116265d099114d6 (patch) | |
tree | 97977009422d675f8930f97c309b010481289e72 /nixpkgs/pkgs/applications/version-management/subversion | |
parent | 4dc8afe4fd6b18437150129e0a1ecc23c6a1c0b9 (diff) | |
parent | bc9df0f66110039e495b6debe3a6cda4a1bb0fed (diff) | |
download | nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.gz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.bz2 nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.lz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.xz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.zst nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.zip |
Merge commit 'bc9df0f66110039e495b6debe3a6cda4a1bb0fed'
Diffstat (limited to 'nixpkgs/pkgs/applications/version-management/subversion')
-rw-r--r-- | nixpkgs/pkgs/applications/version-management/subversion/default.nix | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/subversion/default.nix b/nixpkgs/pkgs/applications/version-management/subversion/default.nix index e5940c939561..81949f951069 100644 --- a/nixpkgs/pkgs/applications/version-management/subversion/default.nix +++ b/nixpkgs/pkgs/applications/version-management/subversion/default.nix @@ -38,9 +38,10 @@ let patches = [ ./apr-1.patch ]; - # SVN build seems broken on gcc5: - # https://gcc.gnu.org/gcc-5/porting_to.html - CPPFLAGS = "-P"; + # We are hitting the following issue even with APR 1.6.x + # -> https://issues.apache.org/jira/browse/SVN-4813 + # "-P" CPPFLAG is needed to build Python bindings and subversionClient + CPPFLAGS = [ "-P" ]; configureFlags = [ (stdenv.lib.withFeature bdbSupport "berkeley-db") @@ -110,14 +111,9 @@ let }); in { - subversion18 = common { - version = "1.8.19"; - sha256 = "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n"; - }; - subversion19 = common { - version = "1.9.9"; - sha256 = "1ll13ychbkp367c7zsrrpda5nygkryma5k18qfr8wbaq7dbvxzcd"; + version = "1.9.10"; + sha256 = "1mwwbjs8nqr8qyc0xzy7chnylh4q3saycvly8rzq32swadbcca5f"; }; subversion_1_10 = common { @@ -126,9 +122,9 @@ in { extraBuildInputs = [ lz4 utf8proc ]; }; - subversion_1_11 = common { - version = "1.11.1"; - sha256 = "1fv0psjxx5nxb4zmddyrma2bnv1bfff4p8ii6j8fqwjdr982gzcy"; + subversion = common { + version = "1.12.0"; + sha256 = "1prfbrd1jnndb5fcsvwnzvdi7c0bpirb6pmfq03w21x0v1rprbkz"; extraBuildInputs = [ lz4 utf8proc ]; }; } |