From bdb4e928a453e68a9e51d78fc952457a864b6c3e Mon Sep 17 00:00:00 2001 From: aviac Date: Fri, 16 May 2025 09:07:59 +0200 Subject: [PATCH] use nixos-unstable --- flake.lock | 32 +++++++++----------------------- flake.nix | 12 +++++++++--- 2 files changed, 18 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 13ad1a5..f073052 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,9 @@ "nodes": { "disko": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1747274630, @@ -35,37 +37,21 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747060738, - "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { - "locked": { - "lastModified": 1745279238, - "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -85,13 +71,13 @@ "inputs": { "disko": "disko", "facter": "facter", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1746485181, diff --git a/flake.nix b/flake.nix index 7740e42..4c419a8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,15 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; sops-nix.url = "github:Mic92/sops-nix"; - disko.url = "github:nix-community/disko"; - facter.url = "github:nix-community/nixos-facter-modules"; + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + facter = { + url = "github:nix-community/nixos-facter-modules"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: {