Merge branch 'master' into staging-next

2021-04-06 16:01:14 +02:00
parent 44e3fc61fe 413e9561f8
commit c04a14edd6
493 changed files with 4687 additions and 2055 deletions
@@ -16,7 +16,7 @@ common =
  , jq, libarchive, libcpuid
  , lowdown, mdbook
  # Used by tests
-  , gmock
+  , gtest
  , busybox-sandbox-shell
  , storeDir
  , stateDir
@@ -56,7 +56,7 @@ common =
        ]
        ++ lib.optionals stdenv.isDarwin [ Security ]
        ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-        ++ lib.optionals is24 [ libarchive gmock lowdown ]
+        ++ lib.optionals is24 [ libarchive gtest lowdown ]
        ++ lib.optional (is24 && stdenv.isx86_64) libcpuid
        ++ lib.optional withLibseccomp libseccomp
        ++ lib.optional withAWS