about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Young <lost.networking@gmail.com>2022-02-08 04:01:47 +0000
committerGitHub <noreply@github.com>2022-02-07 23:01:47 -0500
commit8b0b5be13a2415b12b83f9e573565a46a204d06b (patch)
tree042938238240ad1363f4d2c4e096ab039cf2ddd6
parent4a0ad7b7142a0bd9b9e53876292d59dd040bf6f9 (diff)
foundationdb61: pin Boost dep to boost168 (#157967)
-rw-r--r--pkgs/servers/foundationdb/cmake.nix2
-rw-r--r--pkgs/servers/foundationdb/default.nix3
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index 2a94008a4e9ae..98fd6ca79813e 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -123,7 +123,7 @@ let
           homepage    = "https://www.foundationdb.org";
           license     = licenses.asl20;
           platforms   = [ "x86_64-linux" ];
-          maintainers = with maintainers; [ thoughtpolice ];
+          maintainers = with maintainers; [ thoughtpolice lostnet ];
        };
     };
 in makeFdb
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index b3a876546e784..69e4ad9bd0188 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -2,7 +2,7 @@
 , lib, fetchurl, fetchpatch, fetchFromGitHub
 
 , cmake, ninja, which, findutils, m4, gawk
-, python2, python3, openjdk, mono, libressl, boost
+, python2, python3, openjdk, mono, libressl, boost168
 }@args:
 
 let
@@ -10,6 +10,7 @@ let
   cmakeBuild = import ./cmake.nix (args // {
     gccStdenv    = gccStdenv;
     llvmPackages = llvmPackages;
+    boost        = boost168;
   });
 
   python3-six-patch = fetchpatch {