diff options
| author | Sandro | 2021-03-05 02:12:20 +0100 |
|---|---|---|
| committer | GitHub | 2021-03-05 02:12:20 +0100 |
| commit | a908dd415ddea0a1f8eab87fa79f1dcce058b03b (patch) | |
| tree | 15282f54cc558fa70885a1feed1678ec1eec15b5 /pkgs/servers/foundationdb | |
| parent | 1f86598bb735439cb5a5ac50ab6f91a88b8771ee (diff) | |
| parent | 3aa47450f1f85cfbd398ecd61a6bfed0900f33d4 (diff) | |
Merge pull request #114176 from omasanori/fix-foundationdb61
foundationdb61: 6.1.12 -> 6.1.13, fix build
Diffstat (limited to 'pkgs/servers/foundationdb')
| -rw-r--r-- | pkgs/servers/foundationdb/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/servers/foundationdb/patches/stdexcept-6.1.patch | 24 |
2 files changed, 27 insertions, 2 deletions
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index e1cb2e29a05a..78addfc4aa2f 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -77,13 +77,14 @@ in with builtins; { # ------------------------------------------------------ foundationdb61 = cmakeBuild { - version = "6.1.12"; + version = "6.1.13"; branch = "release-6.1"; - sha256 = "1yh5hx6rim41m0dwhnb2pcwz67wlnk0zwvyw845d36b29gwy58ab"; + sha256 = "10vd694dcnh2pp91mri1m80kfbwjanhiy50c53c5ncqfa6pwvk00"; patches = [ ./patches/clang-libcxx.patch ./patches/suppress-clang-warnings.patch + ./patches/stdexcept-6.1.patch glibc230-fix ]; }; diff --git a/pkgs/servers/foundationdb/patches/stdexcept-6.1.patch b/pkgs/servers/foundationdb/patches/stdexcept-6.1.patch new file mode 100644 index 000000000000..9ebe0c6c0fb5 --- /dev/null +++ b/pkgs/servers/foundationdb/patches/stdexcept-6.1.patch @@ -0,0 +1,24 @@ +diff --git a/FDBLibTLS/FDBLibTLSPolicy.cpp b/FDBLibTLS/FDBLibTLSPolicy.cpp +index 728ff871d..46e1dd289 100644 +--- a/FDBLibTLS/FDBLibTLSPolicy.cpp ++++ b/FDBLibTLS/FDBLibTLSPolicy.cpp +@@ -31,6 +31,7 @@ + #include <algorithm> + #include <exception> + #include <map> ++#include <stdexcept> + #include <string> + #include <vector> + +diff --git a/FDBLibTLS/FDBLibTLSVerify.cpp b/FDBLibTLS/FDBLibTLSVerify.cpp +index 594389916..1c8b9b50d 100644 +--- a/FDBLibTLS/FDBLibTLSVerify.cpp ++++ b/FDBLibTLS/FDBLibTLSVerify.cpp +@@ -25,6 +25,7 @@ + #include <algorithm> + #include <exception> + #include <cstring> ++#include <stdexcept> + + static int hexValue(char c) { + static char const digits[] = "0123456789ABCDEF"; |