diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index e5940c939561..1b3c45ccb398 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 57ba1ab44dcc..6bca75336b33 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;