From 0a6777c2a1f9fa0a7ee0bc24f8742ad04ceb3509 Mon Sep 17 00:00:00 2001 From: "git@71rd.net" Date: Thu, 25 Sep 2025 23:24:14 +0000 Subject: [PATCH] botan2: remove Removing botan2 from nixpkgs. Botan2 has been end-of-life since 2025-01-01 and was replaced with Botan3. Fixes: #445861 --- pkgs/development/libraries/botan/default.nix | 18 ++---------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 9cfa9570b7f9..03f0f0918412 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchpatch, fetchurl, pkgsStatic, python3, @@ -146,7 +145,7 @@ let doCheck = true; - passthru.tests = lib.optionalAttrs (lib.versionAtLeast version "3") { + passthru.tests = { static = pkgsStatic.botan3; }; @@ -159,7 +158,7 @@ let thillux nikstur ]; - platforms = platforms.unix ++ lib.optionals (lib.versionAtLeast version "3.0") platforms.windows; + platforms = platforms.unix ++ platforms.windows; license = licenses.bsd2; }; }); @@ -169,17 +168,4 @@ in version = "3.9.0"; hash = "sha256-jD8oS1jd1C6OQ+n6hqcSnYfqfD93aoDT2mPsIHIrCIM="; }; - - botan2 = common { - version = "2.19.5"; - hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ="; - patches = [ - # Fix build with gcc15 - (fetchpatch { - name = "botan2-add-include-cstdint-gcc15.patch"; - url = "https://src.fedoraproject.org/rpms/botan2/raw/c3fb7a3800df117e7ef8a7617ac8eacb31a4464a/f/f765f0b312f2998498f629d93369babfb2c975b4.patch"; - hash = "sha256-8Yhxd5TCgxUMtRiv3iq5sQaVjDF+b9slppm38/6l6lw="; - }) - ]; - }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dc6dc101c845..cf220f6995a7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -563,6 +563,7 @@ mapAliases { boost184 = throw "Boost 1.84 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24 boost185 = throw "Boost 1.85 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24 boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01 + botan2 = throw "botan2 has been removed as it is EOL"; # Added 2025-10-20 bower2nix = throw "bower2nix has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17 bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30 bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a65617f48b5d..860d0312cc45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7012,7 +7012,6 @@ with pkgs; # botan3 only sensibly works with libcxxStdenv when building static binaries stdenv = if stdenv.hostPlatform.isStatic then buildPackages.libcxxStdenv else stdenv; }) - botan2 botan3 ; botanEsdm = botan3.override { withEsdm = true; };