about summary refs log tree commit diff
path: root/pkgs/servers/nosql
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2024-01-18 18:00:55 +0000
committerGitHub <noreply@github.com>2024-01-18 18:00:55 +0000
commitdc4a7c97b018477201ebbdb78903a323bd65a61d (patch)
tree6a67889ba4e885f85ac7d83af8e570ed87d3a080 /pkgs/servers/nosql
parent5d5d432ec4b8ae16b612f0c02d00130ca9448d71 (diff)
parent3df632c2fba47c5d477f498b02add5c7aa2126f3 (diff)
downloadnixlib-dc4a7c97b018477201ebbdb78903a323bd65a61d.tar
nixlib-dc4a7c97b018477201ebbdb78903a323bd65a61d.tar.gz
nixlib-dc4a7c97b018477201ebbdb78903a323bd65a61d.tar.bz2
nixlib-dc4a7c97b018477201ebbdb78903a323bd65a61d.tar.lz
nixlib-dc4a7c97b018477201ebbdb78903a323bd65a61d.tar.xz
nixlib-dc4a7c97b018477201ebbdb78903a323bd65a61d.tar.zst
nixlib-dc4a7c97b018477201ebbdb78903a323bd65a61d.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/nosql')
-rw-r--r--pkgs/servers/nosql/surrealdb/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/servers/nosql/surrealdb/default.nix b/pkgs/servers/nosql/surrealdb/default.nix
index ebe114fcf289..d32ad5214565 100644
--- a/pkgs/servers/nosql/surrealdb/default.nix
+++ b/pkgs/servers/nosql/surrealdb/default.nix
@@ -43,6 +43,11 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl ]
     ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ];
 
+  checkFlags = [
+    # flaky
+    "--skip=ws_integration::none::merge"
+  ];
+
   passthru.tests.version = testers.testVersion {
     package = surrealdb;
     command = "surreal version";