From 3d69d435ba19175a76d733c96ad09a2f93483e95 Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Tue, 29 Oct 2024 10:23:30 +0100
Subject: [PATCH] botan3: 3.5.0 -> 3.6.1

Notable changes:
* increased EC performance
* better CPU feature detection
* more work on PQ algorithm support

Full changelog:
https://botan.randombit.net/news.html#version-3-6-1-2024-10-26

Signed-off-by: Markus Theil <theil.markus@gmail.com>
---
 pkgs/development/libraries/botan/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 976144b1b5ca..8d11ee2b7937 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -6,6 +6,7 @@
   docutils,
   bzip2,
   zlib,
+  jitterentropy,
   darwin,
   static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
 }:
@@ -56,7 +57,10 @@ let
             CoreServices
             Security
           ]
-        );
+        )
+        ++ lib.optionals (lib.versionAtLeast version "3.6.0") [
+          jitterentropy
+        ];
 
       buildTargets =
         [ "cli" ]
@@ -81,6 +85,9 @@ let
         ]
         ++ lib.optionals stdenv.hostPlatform.isAarch64 [
           "--cpu=aarch64"
+        ]
+        ++ lib.optionals (lib.versionAtLeast version "3.6.0") [
+          "--enable-modules=jitter_rng"
         ];
 
       configurePhase = ''
@@ -117,8 +124,8 @@ let
 in
 {
   botan3 = common {
-    version = "3.5.0";
-    hash = "sha256-Z+ja4cokaNkN5OYByH1fMf9JKzjoq4vL0C3fcQTtip8=";
+    version = "3.6.1";
+    hash = "sha256-fLhXXYjSMsdxdHadf54ku0REQWBYWYbuvWbnScuakIk=";
     # this patch fixes build errors on MacOS with SDK 10.12, recheck to remove this again
     patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./botan3-macos.patch ];
   };