Merge pull request #311 from nix-community/nixos-facter

switch back to nixos-unstable
nix-community · Dec 21, 2024 · 3df9702 · 3df9702
2 parents 87813ad + 65601a5
commit 3df9702
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -1,14 +1,13 @@
 queue_rules:
   - name: default
-    queue_conditions:
-      - base=main
-      - label~=merge-queue|dependencies
     merge_conditions:
       - check-success=buildbot/nix-build
     merge_method: rebase
 
 pull_request_rules:
   - name: refactored queue action rule
-    conditions: []
+    conditions:
+      - base=main
+      - label~=merge-queue|dependencies
     actions:
       queue:
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,8 +1,7 @@
 {
   description = "NixOS images";
 
-  # https://github.com/NixOS/nixpkgs/pull/364924
-  inputs.nixos-unstable.url = "github:Mic92/nixpkgs/compression";
+  inputs.nixos-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   inputs.nixos-stable.url = "github:Mic92/nixpkgs/compression-24.11";
 
   nixConfig.extra-substituters = [ "https://nix-community.cachix.org" ];