diff --git a/flake.lock b/flake.lock index 680d48b..cdd41ea 100644 --- a/flake.lock +++ b/flake.lock @@ -256,7 +256,9 @@ }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1789978172, @@ -299,15 +301,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1789546076, - "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=", - "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz" + "lastModified": 1790046670, + "narHash": "sha256-MYiI+CzL0tuWgRPjGsKCDHqYs2T3OzMlMQWOYWG0qso=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6774f7bc253789b113a4f39285dc0fa100abeacc", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-docs": { @@ -342,22 +347,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1790046670, - "narHash": "sha256-MYiI+CzL0tuWgRPjGsKCDHqYs2T3OzMlMQWOYWG0qso=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6774f7bc253789b113a4f39285dc0fa100abeacc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nmd": { "inputs": { "nixpkgs": [ @@ -455,7 +444,7 @@ "nix-systems": "nix-systems", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "plasma-manager": "plasma-manager", "proxy-suite": "proxy-suite", "sops-nix": "sops-nix", @@ -499,24 +488,11 @@ "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { - "systems": "systems" + "systems": [ + "nix-systems" + ] }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index ffd29be..ff77e68 100644 --- a/flake.nix +++ b/flake.nix @@ -39,9 +39,17 @@ }; }; - utils.url = "github:numtide/flake-utils"; + utils = { + url = "github:numtide/flake-utils"; + # flake-utils тянет systems (nix-systems/default) сам -> наследуем корневой, чтобы не плодить дубль-узел в flake.lock + inputs.systems.follows = "nix-systems"; + }; flake-compat.url = "github:edolstra/flake-compat"; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + nixos-hardware = { + url = "github:NixOS/nixos-hardware/master"; + # без follows nixos-hardware лочит свой собственный nixpkgs (две копии в lock/store) + inputs.nixpkgs.follows = "nixpkgs"; + }; nix-systems.url = "github:nix-systems/default"; # nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; # flake-utils.url = "github:numtide/flake-utils";