From 0d8316000c0b07dab104ce21c5a97d388de2d9bd Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Tue, 20 Jun 2023 23:01:12 +0200 Subject: [PATCH] libressl_3_4: drop unsupported package LibreSSL 3.4 has been unsupported for a long time, but we couldn't drop it because some packages still depended on it. A quick 'git grep' shows that this is no longer the case now, we can finally remove it. This fixes https://github.com/NixOS/nixpkgs/issues/216207. --- pkgs/development/libraries/libressl/default.nix | 16 ---------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 17 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index c4f75f45950f..e39739164bb2 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -91,22 +91,6 @@ let }; in { - libressl_3_4 = generic { - version = "3.4.3"; - hash = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; - knownVulnerabilities = [ "Support ended 2022-10-14." ]; - patches = [ - (fetchpatch { - # https://marc.info/?l=libressl&m=167582148932407&w=2 - name = "backport-type-confusion-fix.patch"; - url = "https://raw.githubusercontent.com/libressl/portable/30dc760ed1d7c70766b135500950d8ca9d17b13a/patches/x509_genn.c.diff"; - sha256 = "sha256-N9jsOueqposDWZwaR+n/v/cHgNiZbZ644d8/wKjN2/M="; - stripLen = 2; - extraPrefix = "crypto/"; - }) - ]; - }; - libressl_3_6 = generic { version = "3.6.2"; hash = "sha256-S+gP/wc3Rs9QtKjlur4nlayumMaxMqngJRm0Rd+/0DM="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 790acf39453c..8d89d48e2ef0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23626,7 +23626,6 @@ with pkgs; }; inherit (callPackages ../development/libraries/libressl { }) - libressl_3_4 libressl_3_6 libressl_3_7;