Merge pull request #122 from NixOS/update_flake_lock_action

disable tests on macos
NixOS · Oct 20, 2024 · 02905ca · 02905ca
2 parents c3fb03f + a38b6ec
commit 02905ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -2,11 +2,8 @@ queue_rules:
   - name: default
     merge_conditions:
       - check-success=buildbot/nix-build
-defaults:
-  actions:
-    queue:
-      allow_merging_configuration_change: true
-      method: rebase
+    batch_size: 5
+    merge_method: rebase
 pull_request_rules:
   - name: merge using the merge queue
     conditions:

diff --git a/default.nix b/default.nix
@@ -6,6 +6,7 @@
   pytest-mock,
   setuptools,
   git,
+  stdenv,
 }:
 
 buildPythonApplication {
@@ -20,7 +21,8 @@ buildPythonApplication {
       ]
     }"
   ];
-  doCheck = true;
+  # FIXME: hang on macOS just now
+  doCheck = stdenv.isLinux;
   nativeBuildInputs = [ setuptools ];
   nativeCheckInputs = [
     pytest-mock