Merge pull request #212184 from helsinki-systems/drop/openvpn_24

openvpn_24: remove
This commit is contained in:
Nick Cao 2023-01-29 08:11:42 +08:00 committed by GitHub
commit fc5ac40f62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 8 deletions

View File

@ -5,7 +5,6 @@
, iproute2
, lzo
, openssl
, openssl_1_1
, pam
, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
, systemd
@ -74,12 +73,6 @@ let
in
{
openvpn_24 = generic {
version = "2.4.12";
sha256 = "1vjx82nlkxrgzfiwvmmlnz8ids5m2fiqz7scy1smh3j9jnf2v5b6";
extraBuildInputs = [ openssl_1_1 ];
};
openvpn = generic {
version = "2.5.8";
sha256 = "1cixqm4gn2d1v8qkbww75j30fzvxz13gc7whcmz54i0x4fvibwx6";

View File

@ -1087,6 +1087,7 @@ mapAliases ({
opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22
openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22
openssl_3_0 = openssl_3; # Added 2022-06-27
openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23
orchis = orchis-theme; # Added 2021-06-09
osxfuse = macfuse-stubs; # Added 2021-03-20
otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02

View File

@ -10396,7 +10396,6 @@ with pkgs;
opentsdb = callPackage ../tools/misc/opentsdb {};
inherit (callPackages ../tools/networking/openvpn {})
openvpn_24
openvpn;
openvpn3 = callPackage ../tools/networking/openvpn3 { };