diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
| commit | 6c3ffdc228a9808c65a0205cd1fd404578d02dee (patch) | |
| tree | c5998bfbac1bc92dace314e051164f830976d661 /nixpkgs/pkgs/servers/foundationdb | |
| parent | ef93931efff0323fd13c4270415b578c73b5ef35 (diff) | |
| parent | 83ba5afcc9682b52b39a9a958f730b966cc369c5 (diff) | |
| download | nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.gz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.bz2 nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.lz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.xz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.zst nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.zip | |
Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'
Diffstat (limited to 'nixpkgs/pkgs/servers/foundationdb')
| -rw-r--r-- | nixpkgs/pkgs/servers/foundationdb/cmake.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/foundationdb/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/servers/foundationdb/cmake.nix b/nixpkgs/pkgs/servers/foundationdb/cmake.nix index 4ae96e95269c..87e4a22b0514 100644 --- a/nixpkgs/pkgs/servers/foundationdb/cmake.nix +++ b/nixpkgs/pkgs/servers/foundationdb/cmake.nix @@ -1,6 +1,6 @@ # This builder is for FoundationDB CMake build system. -{ lib, fetchurl, fetchpatch, fetchFromGitHub +{ lib, fetchFromGitHub , cmake, ninja, boost, python3, openjdk, mono, libressl , gccStdenv, llvmPackages @@ -16,7 +16,7 @@ let makeFdb = { version - , branch + , branch # unused , sha256 , rev ? "refs/tags/${version}" , officialRelease ? true diff --git a/nixpkgs/pkgs/servers/foundationdb/default.nix b/nixpkgs/pkgs/servers/foundationdb/default.nix index ec28986f2e20..b29c5298b77d 100644 --- a/nixpkgs/pkgs/servers/foundationdb/default.nix +++ b/nixpkgs/pkgs/servers/foundationdb/default.nix @@ -69,9 +69,9 @@ in with builtins; { # ------------------------------------------------------ foundationdb61 = cmakeBuild rec { - version = "6.1.8"; + version = "6.1.10"; branch = "release-6.1"; - sha256 = "1qd9yf3a7a99nfx7vky0jy8r74yrxjwp9imc6792awn66256pxiv"; + sha256 = "1v278zlrki3da2i2258j2b4rk4fq6d9bj623z01bjrvmaqxc2gry"; patches = [ ./patches/clang-libcxx.patch |