From 912b7dd7fb0acdf93bfa66aa93cf3b520cb0e48d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 16 Sep 2024 12:46:31 +1000 Subject: [PATCH] flake: unpin stable --- flake.lock | 12 ++++++------ flake.nix | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e0eb356..d463e7a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixos-stable": { "locked": { - "lastModified": 1725342337, - "narHash": "sha256-XQXFT2ALf4iYyAKRqg9krQnNVW4DwRXYH279eE0uodQ=", - "owner": "Mic92", + "lastModified": 1726320982, + "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "adc58a51f845b04a4437f17f28bfb79b4aa104e1", + "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", "type": "github" }, "original": { - "owner": "Mic92", - "ref": "zfs-backport", + "owner": "NixOS", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index da3bfde..ab15a11 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,7 @@ description = "NixOS images"; inputs.nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; - #inputs.nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; - # see https://github.com/NixOS/nixpkgs/pull/339180 - inputs.nixos-stable.url = "github:Mic92/nixpkgs/zfs-backport"; + inputs.nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; nixConfig.extra-substituters = [ "https://nix-community.cachix.org" ]; nixConfig.extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];