From 1685f80b9750c057eb0216ff7d8006a90bf9fae7 Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Wed, 8 May 2019 11:56:22 +0200
Subject: [PATCH 1/3] subversion18: remove because EOL

Subversion 1.8 is EOL since the publication of 1.10 in April 2018
https://subversion.apache.org/docs/release-notes/1.10.html#svn-1.8-deprecation
---
 .../version-management/subversion/default.nix            | 9 ---------
 pkgs/top-level/all-packages.nix                          | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index e5940c93956..1b3c45ccb39 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -38,10 +38,6 @@ let
 
     patches = [ ./apr-1.patch ];
 
-    # SVN build seems broken on gcc5:
-    # https://gcc.gnu.org/gcc-5/porting_to.html
-    CPPFLAGS = "-P";
-
     configureFlags = [
       (stdenv.lib.withFeature bdbSupport "berkeley-db")
       (stdenv.lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs")
@@ -110,11 +106,6 @@ let
   });
 
 in {
-  subversion18 = common {
-    version = "1.8.19";
-    sha256 = "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n";
-  };
-
   subversion19 = common {
     version = "1.9.9";
     sha256 = "1ll13ychbkp367c7zsrrpda5nygkryma5k18qfr8wbaq7dbvxzcd";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57ba1ab44dc..6bca75336b3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20051,7 +20051,7 @@ in
     sublime-merge-dev;
 
   inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; })
-    subversion18 subversion19 subversion_1_10 subversion_1_11;
+    subversion19 subversion_1_10 subversion_1_11;
 
   subversion = subversion_1_11;
 

From 78c545fe8309f7cd1d17cd3e5cbd0386b131ef8b Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Wed, 8 May 2019 12:09:54 +0200
Subject: [PATCH 2/3] subversion19: 1.9.9 -> 1.9.10

https://subversion.apache.org/docs/release-notes/1.9
---
 pkgs/applications/version-management/subversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 1b3c45ccb39..3069620176f 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -107,8 +107,8 @@ let
 
 in {
   subversion19 = common {
-    version = "1.9.9";
-    sha256 = "1ll13ychbkp367c7zsrrpda5nygkryma5k18qfr8wbaq7dbvxzcd";
+    version = "1.9.10";
+    sha256 = "1mwwbjs8nqr8qyc0xzy7chnylh4q3saycvly8rzq32swadbcca5f";
   };
 
   subversion_1_10 = common {

From 4f99ea812812f02145ce6d31198297283e24b03d Mon Sep 17 00:00:00 2001
From: c0bw3b <c0bw3b@users.noreply.github.com>
Date: Wed, 8 May 2019 12:19:34 +0200
Subject: [PATCH 3/3] subversion: 1.11.1 -> 1.12.0

v1.12 is a regular release replacing v1.11
https://subversion.apache.org/docs/release-notes/1.12.html
https://subversion.apache.org/roadmap.html#release-planning
---
 pkgs/applications/version-management/subversion/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 3069620176f..928e9f7d0a7 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -117,9 +117,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 ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6bca75336b3..409e6f10731 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20051,9 +20051,7 @@ in
     sublime-merge-dev;
 
   inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; })
-    subversion19 subversion_1_10 subversion_1_11;
-
-  subversion = subversion_1_11;
+    subversion19 subversion_1_10 subversion;
 
   subversionClient = appendToName "client" (pkgs.subversion.override {
     bdbSupport = false;