Unverified Commit 6b2e45b5 authored by lassulus's avatar lassulus Committed by GitHub
Browse files

liboqs: 0.10.1 -> 0.11.0, oqs-provider: 0.6.1 -> 0.7.0 (#347312)

parents 7ba149e9 8f974346

pkgs/by-name/li/liboqs/fix-openssl-detection.patch

+6 −7
Original line number Diff line number Diff line
@@ -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,12 +24,11 @@ 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

pkgs/by-name/li/liboqs/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/by-name/oq/oqs-provider/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [