Merge branch 'master' into config-package

nix-community · Aug 10, 2023 · b7cd7e0 · b7cd7e0
2 parents 6a040ae + e49e988
commit b7cd7e0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -3,13 +3,9 @@ queue_rules:
     merge_conditions:
       - check-success=Evaluate flake.nix
       - check-success=check clippy [x86_64-linux]
-      - check-success=check t00-simple [aarch64-linux]
       - check-success=check t00-simple [x86_64-linux]
-      - check-success=check t01-signing [aarch64-linux]
       - check-success=check t01-signing [x86_64-linux]
-      - check-success=check t02-varnish [aarch64-linux]
       - check-success=check t02-varnish [x86_64-linux]
-      - check-success=check treefmt [aarch64-linux]
       - check-success=check treefmt [x86_64-linux]
       - check-success=devShell default [aarch64-darwin]
       - check-success=devShell default [aarch64-linux]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/harmonia/Cargo.toml b/harmonia/Cargo.toml
@@ -25,7 +25,7 @@ http-range = "0.1"
 askama_escape = "0.10.3"
 percent-encoding = "2.3.0"
 anyhow = "1.0.72"
-tempfile = "3.7.0"
+tempfile = "3.7.1"
 
 
 libnixstore = { path = "../libnixstore" }