From 550e69b7454c97111a60dbbe3874f5eed7e2db1e Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 30 Mar 2021 21:15:50 +0200 Subject: [PATCH] subversion19: drop Subversion 1.9 is EoL [0] and is affected by CVE-2020-17525. [0] https://subversion.apache.org/roadmap.html#release-planning --- pkgs/applications/version-management/subversion/default.nix | 5 ----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 5540e53c84e..d6cad454026 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -111,11 +111,6 @@ let }); in { - subversion19 = common { - version = "1.9.12"; - sha256 = "15z33gdnfiqblm5515020wfdwnp2837r3hnparava6m2fgyiafiw"; - }; - subversion_1_10 = common { version = "1.10.6"; sha256 = "19zc215mhpnm92mlyl5jbv57r5zqp6cavr3s2g9yglp6j4kfgj0q"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a9a0c8dbc2d..aa92c822b5b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -627,6 +627,7 @@ mapAliases ({ rubyMinimal = throw "rubyMinimal was removed due to being unused"; rxvt_unicode-with-plugins = rxvt-unicode; # added 2020-02-02 rxvt_unicode = rxvt-unicode-unwrapped; # added 2020-02-02 + subversion19 = throw "subversion19 has been removed as it has reached its end of life"; # added 2021-03-31 urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # added 2020-02-02 urxvt_perl = rxvt-unicode-plugins.perl; # added 2020-02-02 urxvt_perls = rxvt-unicode-plugins.perls; # added 2020-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ac76781243..3c760c0489e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25636,7 +25636,7 @@ in sublime-merge-dev; inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; }) - subversion19 subversion_1_10 subversion; + subversion_1_10 subversion; subversionClient = appendToName "client" (pkgs.subversion.override { bdbSupport = false;