Unverified Commit b7e2eb1e authored by Markus Theil's avatar Markus Theil Committed by Vladimír Čunát
Browse files

openssl_3_2: remove and switch single user to the default openssl 



Signed-off-by: default avatarMarkus Theil <theil.markus@gmail.com>

Picked from PR https://github.com/NixOS/nixpkgs/pull/345998
except that vcunat used `openssl` instead of `openssl_3_3`

I do think that we should be well covered with 3.0 and 3.3.
https://github.com/openssl/openssl/blob/openssl-3.3.0/NEWS.md
parent 3997afd3

pkgs/development/libraries/openssl/default.nix

+2 −25
Original line number Diff line number Diff line
@@ -312,29 +312,6 @@ in { 
    };

  };



  openssl_3_2 = common {

    version = "3.2.3";

    hash = "sha256-UrXxxrgCK8WGjDCMVPt3cF5wLWxvRZT5mg3yFqz0Yjk=";



    patches = [

      ./3.0/nix-ssl-cert-file.patch



      # openssl will only compile in KTLS if the current kernel supports it.

      # This patch disables build-time detection.

      ./3.0/openssl-disable-kernel-detection.patch



      (if stdenv.hostPlatform.isDarwin

       then ./3.2/use-etc-ssl-certs-darwin.patch

       else ./3.2/use-etc-ssl-certs.patch)

    ];



    withDocs = true;



    extraMeta = {

      license = lib.licenses.asl20;

    };

  };



  openssl_3_3 = common {

    version = "3.3.2";

    hash = "sha256-LopAsBl5r+i+C7+z3l3BxnCf7bRtbInBDaEUq1/D0oE=";
@@ -347,8 +324,8 @@ in { 
      ./3.0/openssl-disable-kernel-detection.patch



      (if stdenv.hostPlatform.isDarwin

       then ./3.2/use-etc-ssl-certs-darwin.patch

       else ./3.2/use-etc-ssl-certs.patch)

       then ./3.3/use-etc-ssl-certs-darwin.patch

       else ./3.3/use-etc-ssl-certs.patch)

    ];



    withDocs = true;

pkgs/tools/networking/cloudflare-warp/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
, makeWrapper

, nftables

, nss

, openssl_3_2

, openssl

}:



stdenv.mkDerivation rec {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec { 
    dbus

    gtk3

    libpcap

    openssl_3_2

    openssl

    nss

    stdenv.cc.cc.lib

  ];

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -22467,7 +22467,6 @@ with pkgs; 
  inherit (callPackages ../development/libraries/openssl { })

    openssl_1_1

    openssl_3

    openssl_3_2

    openssl_3_3;















  opensubdiv = callPackage ../development/libraries/opensubdiv { };