diff --git a/flake.lock b/flake.lock index 7a47755..6d298d2 100644 --- a/flake.lock +++ b/flake.lock @@ -4,7 +4,9 @@ "inputs": { "fenix": "fenix", "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils" }, "locked": { @@ -98,7 +100,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -117,11 +119,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1656241064, - "narHash": "sha256-+jWwBt515aFGukeX8WSafg9CM3Ju3FD0XrF+X4ph0mU=", + "lastModified": 1656353817, + "narHash": "sha256-UJEzMQcft/0Ilu4LWV7UH51mr5UCo28GL06BGO+djv4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "99e33a57149916ebede78ec13edd9ba310c10f2f", + "rev": "78e7c2c397b0376526e83162b58de921362e3399", "type": "github" }, "original": { @@ -132,17 +134,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1645433236, - "narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", + "lastModified": 1653988320, + "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", + "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-21_11": { @@ -209,22 +212,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1653988320, - "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1656265786, "narHash": "sha256-A9RkoGrxzsmMm0vily18p92Rasb+MbdDMaSnzmywXKw=", @@ -239,29 +226,13 @@ "type": "indirect" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1656130826, - "narHash": "sha256-g5Wo75ddDQmWnL70rJCMm+JJlvHbzPFUePUpuMNn5qk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "72d1b0d0fac131df1ea254b65413c85609bdd2ee", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "deploy-rs": "deploy-rs", "flake-parts": "flake-parts", "nix": "nix", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", "stunkymonkey": "stunkymonkey" @@ -286,7 +257,9 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-21_11": "nixpkgs-21_11", "nixpkgs-22_05": "nixpkgs-22_05" }, diff --git a/flake.nix b/flake.nix index 072c862..9807d57 100644 --- a/flake.nix +++ b/flake.nix @@ -11,8 +11,10 @@ nixos-hardware.url = "github:NixOS/nixos-hardware"; deploy-rs.url = "github:input-output-hk/deploy-rs"; + deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.url = "github:Mic92/sops-nix"; + sops-nix.inputs.nixpkgs.follows = "nixpkgs"; stunkymonkey = { url = "github:Stunkymonkey/stunkymonkey.de";