diff options
| author | Austin Seipp <aseipp@pobox.com> | 2019-05-27 21:04:53 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2019-05-27 23:27:38 -0500 |
| commit | 2a56ea3593aa0702a61313572c2211ef947f4d1f (patch) | |
| tree | 8fcd312b55b093251485d64d1f8f6b2908718905 /pkgs/servers/foundationdb | |
| parent | b73d7705cc39cdb6b9b2cec60db126a2516bb5a1 (diff) | |
foundationdb61: 6.1.7pre4928_a990458e -> 6.1.8
This bumps the 6.1.x branch to the official 6.1.8 release. Also fixes a
minor bug in the new CMake build (an invalid parameter passed to CMake)
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/servers/foundationdb')
| -rw-r--r-- | pkgs/servers/foundationdb/cmake.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/foundationdb/default.nix | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index a578b7e0e538..4ae96e95269c 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -41,7 +41,7 @@ let cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - (lib.optionalString officialRelease "FDB_RELEASE=1") + (lib.optionalString officialRelease "-DFDB_RELEASE=TRUE") # FIXME: why can't libressl be found automatically? "-DLIBRESSL_USE_STATIC_LIBS=FALSE" diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 713cc135d294..ec28986f2e20 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -69,11 +69,9 @@ in with builtins; { # ------------------------------------------------------ foundationdb61 = cmakeBuild rec { - version = "6.1.7pre4928_${substring 0 7 rev}"; + version = "6.1.8"; branch = "release-6.1"; - rev = "a990458e81612632159bbf75167a36f64ef228d1"; - sha256 = "1b8ij78xjy30q93hvnrw8llw16q5zlmlq3l6dvnnf8w6ws88y1k0"; - officialRelease = false; + sha256 = "1qd9yf3a7a99nfx7vky0jy8r74yrxjwp9imc6792awn66256pxiv"; patches = [ ./patches/clang-libcxx.patch |