Unverified Commit ae1852e7 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

Merge pull request #308082 from anmonteiro/anmonteiro/openssl-3.3.0 

openssl_3_3: init at 3.3.0
parents 43bf12a6 684cf9f1

pkgs/development/libraries/openssl/default.nix

+23 −0
Original line number Diff line number Diff line
@@ -309,4 +309,27 @@ in { 
      license = licenses.asl20;

    };

  };



  openssl_3_3 = common {

    version = "3.3.0";

    hash = "sha256-U+ZrBDMipgar8Ah+dpmg4DOjf6E/65dC3zXDozsY+wI=";



    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 = with lib; {

      license = licenses.asl20;

    };

  };

}

pkgs/top-level/all-packages.nix

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

    openssl_1_1

    openssl_3

    openssl_3_2;

    openssl_3_2

    openssl_3_3;















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