diff --git a/flake.lock b/flake.lock index c7bd94d..75e49e5 100644 --- a/flake.lock +++ b/flake.lock @@ -2,23 +2,23 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1617673944, - "narHash": "sha256-0GYlbpsmTvt0jUUM47MfCLqBZBBsOqj1lwo4a/anQfY=", + "lastModified": 1617082367, + "narHash": "sha256-W0cQPGjc4IVzryaGycuoS8KZkXafS1P23w/fcKLoD5Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7d10c949fa3cb4d9f44e6a8017b89f55bf58f07d", + "rev": "04a2b269d8921505a2969fc9ec25c1f517f2b307", "type": "github" }, "original": { "id": "nixpkgs", + "ref": "nixos-unstable", "type": "indirect" } }, "root": { "inputs": { "nixpkgs": "nixpkgs", - "stable2009": "stable2009", - "unstable": "unstable" + "stable2009": "stable2009" } }, "stable2009": { @@ -35,21 +35,6 @@ "ref": "nixos-20.09", "type": "indirect" } - }, - "unstable": { - "locked": { - "lastModified": 1617082367, - "narHash": "sha256-W0cQPGjc4IVzryaGycuoS8KZkXafS1P23w/fcKLoD5Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "04a2b269d8921505a2969fc9ec25c1f517f2b307", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index dc250ec..c2b78fd 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,12 @@ { - inputs.unstable.url = "nixpkgs/nixos-unstable"; + inputs.nixpkgs.url = "nixpkgs/nixos-unstable"; inputs.stable2009.url = "nixpkgs/nixos-20.09"; - outputs = { self, nixpkgs, ... }@inputs: { + outputs = { self, nixpkgs, stable2009 }: { nixosModule = { ... }: { imports = [ ./. ]; config = { sconfig.flakes.enable = true; }; }; - nixosConfigurations = import ./hosts { inherit (inputs) unstable stable2009; }; + nixosConfigurations = import ./hosts { inherit nixpkgs stable2009; }; }; } diff --git a/hosts/default.nix b/hosts/default.nix index 5386262..99cb60f 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,4 +1,4 @@ -{ unstable, stable2009 }: +{ nixpkgs, stable2009 }: let commonModules = [ @@ -29,5 +29,5 @@ let in { - vm = mkQemuSystem { name = "vm"; pkgs = unstable; }; + vm = mkQemuSystem { name = "vm"; pkgs = nixpkgs; }; }