diff options
| author | J08nY | 2024-08-12 17:10:32 +0200 |
|---|---|---|
| committer | J08nY | 2024-08-12 17:10:32 +0200 |
| commit | 042413d5b3aa26f369acf82458bd75c97664c824 (patch) | |
| tree | a6e39f2e0ab5f164cf998d95a0f40f13691598a8 | |
| parent | 8e9466cad1983323ec0b7eb1224c3f9cbb0cebe4 (diff) | |
| download | ECTester-042413d5b3aa26f369acf82458bd75c97664c824.tar.gz ECTester-042413d5b3aa26f369acf82458bd75c97664c824.tar.zst ECTester-042413d5b3aa26f369acf82458bd75c97664c824.zip | |
| -rw-r--r-- | flake.nix | 18 | ||||
| -rw-r--r-- | nix/botan-fe25519-stdexcept.patch | 13 | ||||
| -rw-r--r-- | nix/botan-types-stdexcept.patch | 12 |
3 files changed, 35 insertions, 8 deletions
@@ -87,14 +87,16 @@ inherit hash; }; patches = - if pkgs.lib.hasPrefix "2.0" version then - (prev.patches or [ ]) - ++ [ - # Fix missing include https://github.com/randombit/botan/issues/903 - ./nix/botan-2.0.0-2.0.1.patch - ] - else - [ ]; + { "2.0.0" = ./nix/botan-2.0.0-2.0.1.patch; + "2.0.1" = ./nix/botan-2.0.0-2.0.1.patch; + "2.2.0" = [./nix/botan-fe25519-stdexcept.patch ]; + "2.3.0" = [./nix/botan-fe25519-stdexcept.patch ./nix/botan-types-stdexcept.patch]; + "2.4.0" = [./nix/botan-fe25519-stdexcept.patch ./nix/botan-types-stdexcept.patch]; + "2.5.0" = [./nix/botan-fe25519-stdexcept.patch ./nix/botan-types-stdexcept.patch]; + "2.6.0" = [./nix/botan-fe25519-stdexcept.patch ./nix/botan-types-stdexcept.patch]; + "2.7.0" = [./nix/botan-fe25519-stdexcept.patch ./nix/botan-types-stdexcept.patch]; + "2.8.0" = [./nix/botan-fe25519-stdexcept.patch ./nix/botan-types-stdexcept.patch];}."${version}" or (prev.patches or [ ]); + patchFlags = ["-p1" "-r-"]; } ); diff --git a/nix/botan-fe25519-stdexcept.patch b/nix/botan-fe25519-stdexcept.patch new file mode 100644 index 0000000..f85ff4d --- /dev/null +++ b/nix/botan-fe25519-stdexcept.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/pubkey/ed25519/ed25519_fe.h b/src/lib/pubkey/ed25519/ed25519_fe.h +--- a/src/lib/pubkey/ed25519/ed25519_fe.h ++++ b/src/lib/pubkey/ed25519/ed25519_fe.h +@@ -11,8 +11,9 @@ + #ifndef BOTAN_ED25519_FE_H__ + #define BOTAN_ED25519_FE_H__ + + #include <botan/mem_ops.h> ++#include <stdexcept> + + namespace Botan { + + /** diff --git a/nix/botan-types-stdexcept.patch b/nix/botan-types-stdexcept.patch new file mode 100644 index 0000000..d5a0984 --- /dev/null +++ b/nix/botan-types-stdexcept.patch @@ -0,0 +1,12 @@ +diff --git a/src/lib/utils/types.h b/src/lib/utils/types.h +--- a/src/lib/utils/types.h ++++ b/src/lib/utils/types.h +@@ -15,6 +15,8 @@ + #include <cstddef> // IWYU pragma: export + #include <cstdint> // IWYU pragma: export + #include <memory> // IWYU pragma: export ++#include <stdexcept> ++#include <string> + + namespace Botan { + |