Unverified Commit 8f9b2e5f authored by K900's avatar K900 Committed by GitHub
Browse files

openssl: 3.5.2 -> 3.6.0; openssl_3: 3.0.17 -> 3.0.18; openssl: enable tests... 

openssl: 3.5.2 -> 3.6.0; openssl_3: 3.0.17 -> 3.0.18; openssl: enable tests and add comments (#447713)
parents 3deb8d27 87c0c5e5

pkgs/development/libraries/openssl/default.nix

+16 −5
Original line number Diff line number Diff line
@@ -244,6 +244,11 @@ let 


      enableParallelBuilding = true;



      doCheck = true;

      preCheck = ''

        patchShebangs util

      '';



      postInstall =

        (

          if static then
@@ -364,16 +369,19 @@ in 
  };



  openssl_3 = common {

    version = "3.0.17";

    hash = "sha256-39135OobV/86bb3msL3D8x21rJnn/dTq+eH7tuwtuM4=";

    version = "3.0.18";

    hash = "sha256-2Aw09c+QLczx8bXfXruG0DkuNwSeXXPfGzq65y5P/os=";



    patches = [

      # Support for NIX_SSL_CERT_FILE, motivation:

      # https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e

      ./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



      # Look up SSL certificates in /etc rather than the immutable installation directory

      (

        if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch

      )
@@ -386,17 +394,20 @@ in 
    };

  };



  openssl_3_5 = common {

    version = "3.5.2";

    hash = "sha256-xTpH5eRByTDDkoz3v2+wDl0Sm2MOCqhzsIJYZW5zRew=";

  openssl_3_6 = common {

    version = "3.6.0";

    hash = "sha256-tqX0S362nj+jXb8VUkQFtEg3pIHUPYHa3d4/8h/LuOk=";



    patches = [

      # Support for NIX_SSL_CERT_FILE, motivation:

      # https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e

      ./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



      # Look up SSL certificates in /etc rather than the immutable installation directory

      (

        if stdenv.hostPlatform.isDarwin then

          ./3.5/use-etc-ssl-certs-darwin.patch

pkgs/top-level/all-packages.nix

+2 −2
Original line number Diff line number Diff line
@@ -8369,7 +8369,7 @@ with pkgs; 


  libressl = libressl_4_1;



  openssl = openssl_3_5;

  openssl = openssl_3_6;



  openssl_legacy = openssl.override {

    conf = ../development/libraries/openssl/3.0/legacy.cnf;
@@ -8378,7 +8378,7 @@ with pkgs; 
  inherit (callPackages ../development/libraries/openssl { })

    openssl_1_1

    openssl_3

    openssl_3_5

    openssl_3_6

    ;



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