diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:37:02 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:41:30 +0000 |
commit | 6c557e3f1c28cf87e9fba232811d6875dd1399c1 (patch) | |
tree | 035a071d5d8980df6de0fa42e2ef8fc0cce7055e /nixpkgs/pkgs/servers/foundationdb | |
parent | da7500bc026e937ac7fce7b50f67a0e1765737a7 (diff) | |
parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
download | nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.gz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.bz2 nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.lz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.xz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.zst nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.zip |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/servers/foundationdb')
-rw-r--r-- | nixpkgs/pkgs/servers/foundationdb/cmake.nix | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/servers/foundationdb/default.nix | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/servers/foundationdb/cmake.nix b/nixpkgs/pkgs/servers/foundationdb/cmake.nix index ac7733986ce6..512842b3a6a2 100644 --- a/nixpkgs/pkgs/servers/foundationdb/cmake.nix +++ b/nixpkgs/pkgs/servers/foundationdb/cmake.nix @@ -4,7 +4,7 @@ , cmake, ninja, boost, python3, openjdk, mono, libressl , gccStdenv, llvmPackages -, useClang ? true +, useClang ? false , ... }: diff --git a/nixpkgs/pkgs/servers/foundationdb/default.nix b/nixpkgs/pkgs/servers/foundationdb/default.nix index b3ca7038ebeb..ea762ed656d6 100644 --- a/nixpkgs/pkgs/servers/foundationdb/default.nix +++ b/nixpkgs/pkgs/servers/foundationdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenv49, gcc9Stdenv, llvmPackages_8 +{ stdenv, stdenv49, gccStdenv, llvmPackages , lib, fetchurl, fetchpatch, fetchFromGitHub , cmake, ninja, which, findutils, m4, gawk @@ -8,8 +8,8 @@ let vsmakeBuild = import ./vsmake.nix args; cmakeBuild = import ./cmake.nix (args // { - gccStdenv = gcc9Stdenv; - llvmPackages = llvmPackages_8; + gccStdenv = gccStdenv; + llvmPackages = llvmPackages; }); python3-six-patch = fetchpatch { @@ -69,9 +69,9 @@ in with builtins; { # ------------------------------------------------------ foundationdb61 = cmakeBuild { - version = "6.1.10"; + version = "6.1.12"; branch = "release-6.1"; - sha256 = "1v278zlrki3da2i2258j2b4rk4fq6d9bj623z01bjrvmaqxc2gry"; + sha256 = "1yh5hx6rim41m0dwhnb2pcwz67wlnk0zwvyw845d36b29gwy58ab"; patches = [ ./patches/clang-libcxx.patch |