6 files changed, 29 insertions, 8 deletions
diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh
index 87122e0fb5..f04de0ce6c 100755
--- a/dev/ci/ci-basic-overlay.sh
+++ b/dev/ci/ci-basic-overlay.sh
@@ -209,7 +209,7 @@
 ########################################################################
 # bedrock2
 ########################################################################
-: "${bedrock2_CI_REF:=master}"
+: "${bedrock2_CI_REF:=tested}"
 : "${bedrock2_CI_GITURL:=https://github.com/mit-plv/bedrock2}"
 : "${bedrock2_CI_ARCHIVEURL:=${bedrock2_CI_GITURL}/archive}"
 
diff --git a/dev/ci/nix/default.nix b/dev/ci/nix/default.nix
index a9cc91170f..f08a08531f 100644
--- a/dev/ci/nix/default.nix
+++ b/dev/ci/nix/default.nix
@@ -60,9 +60,23 @@ let iris = (coqPackages.iris.override { inherit coq stdpp; })
 
 let unicoq = callPackage ./unicoq { inherit coq; }; in
 
+let StructTact = coqPackages.StructTact.overrideAttrs (o: {
+    src = fetchTarball "https://github.com/uwplse/StructTact/tarball/master";
+  }); in
+
+let Cheerios = (coqPackages.Cheerios.override { inherit StructTact; })
+  .overrideAttrs (o: {
+    src = fetchTarball "https://github.com/uwplse/cheerios/tarball/master";
+  }); in
+
+let Verdi = (coqPackages.Verdi.override { inherit Cheerios ssreflect; })
+  .overrideAttrs (o: {
+    src = fetchTarball "https://github.com/uwplse/verdi/tarball/master";
+  }); in
+
 let callPackage = newScope { inherit coq
   bignums coq-ext-lib coqprime corn iris math-classes
-  mathcomp simple-io ssreflect stdpp unicoq;
+  mathcomp simple-io ssreflect stdpp unicoq Verdi;
 }; in
 
 # Environments for building CI libraries with this Coq
@@ -89,6 +103,7 @@ let projects = {
   mtac2 = callPackage ./mtac2.nix {};
   oddorder = callPackage ./oddorder.nix {};
   quickchick = callPackage ./quickchick.nix {};
+  verdi-raft = callPackage ./verdi-raft.nix {};
   VST = callPackage ./VST.nix {};
 }; in
 
diff --git a/dev/ci/nix/fiat_crypto.nix b/dev/ci/nix/fiat_crypto.nix
index 0f0ee91387..1105fba7a6 100644
--- a/dev/ci/nix/fiat_crypto.nix
+++ b/dev/ci/nix/fiat_crypto.nix
@@ -1,6 +1,6 @@
-{ coqprime }:
+{ ocamlPackages }:
 {
-  coqBuildInputs = [ coqprime ];
+  buildInputs = with ocamlPackages; [ ocaml findlib ];
   configure = "git submodule update --init --recursive && ulimit -s 32768";
-  make = "make new-pipeline c-files";
+  make = "make c-files printlite lite && make -j 1 coq";
 }
diff --git a/dev/ci/nix/verdi-raft.nix b/dev/ci/nix/verdi-raft.nix
new file mode 100644
index 0000000000..6a98f4ef47
--- /dev/null
+++ b/dev/ci/nix/verdi-raft.nix
@@ -0,0 +1,5 @@
+{ Verdi }:
+{
+  coqBuildInputs = [ Verdi ];
+  configure = "./configure";
+}
diff --git a/dev/nixpkgs.nix b/dev/nixpkgs.nix
index 677377f868..54baaee1fe 100644
--- a/dev/nixpkgs.nix
+++ b/dev/nixpkgs.nix
@@ -1,4 +1,4 @@
 import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/f4ad230f90ef312695adc26f256036203e9c70af.tar.gz";
-  sha256 = "0cdd275dz3q51sknn7s087js81zvaj5riz8f29id6j6chnyikzjq";
+  url = "https://github.com/NixOS/nixpkgs/archive/8da81465c19fca393a3b17004c743e4d82a98e4f.tar.gz";
+  sha256 = "1f3s27nrssfk413pszjhbs70wpap43bbjx2pf4zq5x2c1kd72l6y";
 })
diff --git a/dev/tools/merge-pr.sh b/dev/tools/merge-pr.sh
index c0a3eeb11c..a888998ebf 100755
--- a/dev/tools/merge-pr.sh
+++ b/dev/tools/merge-pr.sh
@@ -137,7 +137,8 @@ if [ "$LOCAL_BRANCH_COMMIT" != "$UPSTREAM_COMMIT" ]; then
     else
         error "Local branch is not up-to-date with ${REMOTE}."
         error "Pull before merging."
-        ask_confirmation
+        # This check should never be bypassed.
+        exit 1
     fi
 fi