From 7caca24a1f47098e4e643705d1729c93889a0d8c Mon Sep 17 00:00:00 2001 From: Solomon Victorino Date: Tue, 8 Oct 2024 10:06:26 -0600 Subject: [PATCH 1/2] liboqs: 0.10.1 -> 0.11.0 --- pkgs/by-name/li/liboqs/fix-openssl-detection.patch | 13 ++++++------- pkgs/by-name/li/liboqs/package.nix | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/li/liboqs/fix-openssl-detection.patch b/pkgs/by-name/li/liboqs/fix-openssl-detection.patch index 33be7188370f..ea90a5d98685 100644 --- a/pkgs/by-name/li/liboqs/fix-openssl-detection.patch +++ b/pkgs/by-name/li/liboqs/fix-openssl-detection.patch @@ -6,14 +6,14 @@ Subject: [PATCH] Do not forcibly set OPENSSL_ROOT_DIR. CMake can already find OpenSSL via pkg-config. Setting OPENSSL_ROOT_DIR forcibly to "/usr" breaks this. --- - CMakeLists.txt | 11 ----------- - 1 file changed, 11 deletions(-) + CMakeLists.txt | 9 --------- + 1 file changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 288bcbe8..9750fae6 100644 +index 0564bc8e..7b4c7f47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -119,17 +119,6 @@ include(.CMake/compiler_opts.cmake) +@@ -144,15 +144,6 @@ include(.CMake/compiler_opts.cmake) include(.CMake/alg_support.cmake) if(${OQS_USE_OPENSSL}) @@ -24,13 +24,12 @@ index 288bcbe8..9750fae6 100644 - elseif(EXISTS "/opt/homebrew/opt/openssl@1.1") - set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/openssl@1.1") - endif() -- elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") -- set(OPENSSL_ROOT_DIR "/usr") - endif() - endif() find_package(OpenSSL 1.1.1 REQUIRED) - endif() + if(OQS_DLOPEN_OPENSSL) + -- 2.42.0 diff --git a/pkgs/by-name/li/liboqs/package.nix b/pkgs/by-name/li/liboqs/package.nix index 36d9d042ca4e..5da88f18169a 100644 --- a/pkgs/by-name/li/liboqs/package.nix +++ b/pkgs/by-name/li/liboqs/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "liboqs"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "open-quantum-safe"; repo = "liboqs"; rev = finalAttrs.version; - hash = "sha256-zsSKFUs75K0Byxh3KVCZ8lIOf/vpbyMJXfk6fa2u+aE="; + hash = "sha256-+Gx1JPrJoeMix9DIF0rJQTivxN1lgaCIYFvJ1pnYZzM="; }; patches = [ From 8f9743465ab4597f3324c75367a1a120c7116f4e Mon Sep 17 00:00:00 2001 From: Solomon Victorino Date: Tue, 8 Oct 2024 10:10:17 -0600 Subject: [PATCH 2/2] oqs-provider: 0.6.1 -> 0.7.0 --- pkgs/by-name/oq/oqs-provider/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oq/oqs-provider/package.nix b/pkgs/by-name/oq/oqs-provider/package.nix index 84ffce3f8f5c..17f73913fcfb 100644 --- a/pkgs/by-name/oq/oqs-provider/package.nix +++ b/pkgs/by-name/oq/oqs-provider/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { name = "oqs-provider"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "open-quantum-safe"; repo = "oqs-provider"; rev = finalAttrs.version; - hash = "sha256-AW0rOszXm9Hy55b2fQ2mpZulhXjYwvztwL6DIFgIzjA="; + hash = "sha256-2+TpYpZwC8vx6tGgS2waD/BQDfnbq0PJIwvX5wDDBEg="; }; nativeBuildInputs = [