nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 15:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #114176 from omasanori/fix-foundationdb61

Browse Source 
foundationdb61: 6.1.12 -> 6.1.13, fix build
This commit is contained in:
Sandro 2021-03-05 02:12:20 +01:00 committed by GitHub
commit a908dd415d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/foundationdb/default.nix
View File

@ -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
];
};

24
pkgs/servers/foundationdb/patches/stdexcept-6.1.patch Normal file
View File

@ -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";