diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix deleted file mode 100644 index 773f2eb75d40..000000000000 --- a/pkgs/development/libraries/mbedtls/2.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ callPackage, fetchpatch }: - -callPackage ./generic.nix { - version = "2.28.10"; - hash = "sha256-09XWds45TFH7GORrju8pVQQQQomU8MlFAq1jJXrLW0s="; - - patches = [ - # cmake 4 compatibility - (fetchpatch { - url = "https://github.com/Mbed-TLS/mbedtls/commit/be4af04fcffcfebe44fa12d39388817d9949a9f3.patch"; - hash = "sha256-CbDm6CchzoTia7Wbpbe3bo9CmHPOsxY2d055AfbCS0g="; - }) - # fix build against Clang >= 20 (https://github.com/Mbed-TLS/mbedtls-framework/pull/173) - (fetchpatch { - name = "Add-__attribute__-nonstring-to-remove-unterminated-s.patch"; - url = "https://github.com/Mbed-TLS/mbedtls-framework/commit/e811994babf84e29e56ebf97265f5fefdf18050f.patch"; - hash = "sha256-PGXh7tMnl7VqBOWVZP3UqT5pEd0yh4oszEJNMiVOcGo="; - }) - # fix build against Clang >= 20 (https://github.com/Mbed-TLS/mbedtls/pull/10215) - (fetchpatch { - name = "Add-__attribute__-nonstring-to-remove-unterminated-s.patch"; - url = "https://github.com/Mbed-TLS/mbedtls/commit/2e1399f1e1ed6fa1072cf9584f5771322b0d001b.patch"; - includes = [ "tests/*" ]; - # drop some context in order to apply the backported patch cleanly - decode = "interdiff -U1 /dev/null -"; - hash = "sha256-OTRnYw7Og6eAsB9pue1jkxO1xnkR48efz5QKjN9H0I8="; - }) - ]; -} diff --git a/pkgs/development/libraries/mbedtls/generic.nix b/pkgs/development/libraries/mbedtls/generic.nix index 2a7f436e9c67..cd7afc8abc90 100644 --- a/pkgs/development/libraries/mbedtls/generic.nix +++ b/pkgs/development/libraries/mbedtls/generic.nix @@ -89,8 +89,5 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ raphaelr ]; - knownVulnerabilities = lib.optionals (lib.versionOlder version "3.0") [ - "Mbed TLS 2 is not maintained anymore. Please migrate to newer versions" - ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9228adf94dc4..e22da3c937ea 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1367,6 +1367,7 @@ mapAliases { matrix-appservice-slack = throw "'matrix-appservice-slack' has been removed, as it relies on Classic Slack Apps, which no longer exist, and is abandoned upstream"; # Added 2025-11-11 matrix-synapse-tools.rust-synapse-compress-state = throw "'matrix-synapse-tools.rust-synapse-compress-state' has been renamed to/replaced by 'rust-synapse-compress-state'"; # Converted to throw 2025-10-27 matrix-synapse-tools.synadm = throw "'matrix-synapse-tools.synadm' has been renamed to/replaced by 'synadm'"; # Converted to throw 2025-10-27 + mbedtls_2 = throw "'mbedtls_2' has been removed as it reached its end of life. Migrate to 'mbedtls'."; mcomix3 = throw "'mcomix3' has been renamed to/replaced by 'mcomix'"; # Converted to throw 2025-10-27 mdbook-alerts = throw "'mdbook-alerts' has been removed because it is deprecated and natively supported by mdbook since version 0.5.0"; # Added 2026-01-07 mdbook-linkcheck = throw "'mdbook-linkcheck' has been removed and replaced by 'mdbook-linkcheck2' due to incompatibility with mdbook version 0.5.0+"; # Added 2026-03-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2dc69324293..dfb2592bf56f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6792,7 +6792,6 @@ with pkgs; ) haskellPackages.matterhorn; - mbedtls_2 = callPackage ../development/libraries/mbedtls/2.nix { }; mbedtls = callPackage ../development/libraries/mbedtls/3.nix { }; simple-dftd3 = callPackage ../development/libraries/science/chemistry/simple-dftd3 { };