pyrox.dev
Merge pull request #114176 from omasanori/fix-foundationdb61
foundationdb61: 6.1.12 -> 6.1.13, fix build
+3
-2
pkgs/servers/foundationdb/default.nix
+3
-2
pkgs/servers/foundationdb/default.nix
···
77
77
# ------------------------------------------------------
78
78
79
79
foundationdb61 = cmakeBuild {
80
-
version = "6.1.12";
80
+
version = "6.1.13";
81
81
branch = "release-6.1";
82
-
sha256 = "1yh5hx6rim41m0dwhnb2pcwz67wlnk0zwvyw845d36b29gwy58ab";
82
+
sha256 = "10vd694dcnh2pp91mri1m80kfbwjanhiy50c53c5ncqfa6pwvk00";
83
83
84
84
patches = [
85
85
./patches/clang-libcxx.patch
86
86
./patches/suppress-clang-warnings.patch
87
+
./patches/stdexcept-6.1.patch
87
88
glibc230-fix
88
89
];
89
90
};
+24
pkgs/servers/foundationdb/patches/stdexcept-6.1.patch
+24
pkgs/servers/foundationdb/patches/stdexcept-6.1.patch
···
1
+
diff --git a/FDBLibTLS/FDBLibTLSPolicy.cpp b/FDBLibTLS/FDBLibTLSPolicy.cpp
2
+
index 728ff871d..46e1dd289 100644
3
+
--- a/FDBLibTLS/FDBLibTLSPolicy.cpp
4
+
+++ b/FDBLibTLS/FDBLibTLSPolicy.cpp
5
+
@@ -31,6 +31,7 @@
6
+
#include <algorithm>
7
+
#include <exception>
8
+
#include <map>
9
+
+#include <stdexcept>
10
+
#include <string>
11
+
#include <vector>
12
+
13
+
diff --git a/FDBLibTLS/FDBLibTLSVerify.cpp b/FDBLibTLS/FDBLibTLSVerify.cpp
14
+
index 594389916..1c8b9b50d 100644
15
+
--- a/FDBLibTLS/FDBLibTLSVerify.cpp
16
+
+++ b/FDBLibTLS/FDBLibTLSVerify.cpp
17
+
@@ -25,6 +25,7 @@
18
+
#include <algorithm>
19
+
#include <exception>
20
+
#include <cstring>
21
+
+#include <stdexcept>
22
+
23
+
static int hexValue(char c) {
24
+
static char const digits[] = "0123456789ABCDEF";