From f322bbe86c9f842057905460e570668e08cd42f1 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 29 Mar 2026 23:23:43 +0100 Subject: [PATCH] ustream-ssl-wolfssl: drop --- pkgs/development/libraries/ustream-ssl/default.nix | 3 +-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/ustream-ssl/default.nix b/pkgs/development/libraries/ustream-ssl/default.nix index 3f24ddce7222..e787cdf8adc5 100644 --- a/pkgs/development/libraries/ustream-ssl/default.nix +++ b/pkgs/development/libraries/ustream-ssl/default.nix @@ -6,7 +6,6 @@ pkg-config, libubox-nossl, ssl_implementation, - additional_buildInputs ? [ ], }: stdenv.mkDerivation { @@ -35,7 +34,7 @@ stdenv.mkDerivation { cmake pkg-config ]; - buildInputs = [ ssl_implementation ] ++ additional_buildInputs; + buildInputs = [ ssl_implementation ]; passthru = { inherit ssl_implementation; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c981d9735f15..421eee1720dc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2051,6 +2051,7 @@ mapAliases { unixODBCDrivers = warnAlias "'unixODBCDrivers' has been renamed to 'unixodbcDrivers'" unixodbcDrivers; # Added 2026-02-12 unrar_6 = throw "'unrar_6' has been renamed to/replaced by 'unrar'"; # Added 2026-03-11 unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24 + ustream-ssl-wolfssl = throw "'ustream-ssl-wolfssl' has been removed, use 'ustream-ssl' or 'ustream-ssl-mbedtls'"; # Added 2026-03-29 usync = throw "'usync' has been removed as it is unused and unmaintained upstream"; # Added 2025-12-18 util-linuxCurses = throw "'util-linuxCurses' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2025-10-27 utillinux = warnAlias "'utillinux' has been renamed to/replaced by 'util-linux'" util-linux; # Converted to warning 2025-10-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f6e2ca21da8..90a2e1f5500d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6134,11 +6134,6 @@ with pkgs; ustream-ssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = openssl; }; - ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { - ssl_implementation = wolfssl; - additional_buildInputs = [ openssl ]; - }; - ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { ssl_implementation = mbedtls_2; };