diff --git a/flake.lock b/flake.lock index c349a22..4bfb60f 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1660407119, - "narHash": "sha256-04lWO0pDbhAXFdL4v2VzzwgxrZ5IefKn+TmZPiPeKxg=", + "lastModified": 1662458987, + "narHash": "sha256-hcDwRlsXZMp2Er3vQk1JEUZWhBPLVC9vTT4xHvhpcE0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "12620020f76b1b5d2b0e6fbbda831ed4f5fe56e1", + "rev": "504b32caf83986b7e6b9c79c1c13008f83290f19", "type": "github" }, "original": { @@ -34,11 +34,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1661864979, - "narHash": "sha256-ajXYYTE1uoY3ei/P1v+Knklf2QNCBxMtw1gByaPTGU4=", + "lastModified": 1662099760, + "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a28adc36c20fd2fbaeb06ec9bbd79b6bf7443979", + "rev": "67e45078141102f45eff1589a831aeaa3182b41e", "type": "github" }, "original": { @@ -48,38 +48,6 @@ "type": "github" } }, - "nixpkgs-22_05": { - "locked": { - "lastModified": 1661656705, - "narHash": "sha256-1ujNuL1Tx1dt8dC/kuYS329ZZgiXXmD96axwrqsUY7w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "290dbaacc1f0b783fd8e271b585ec2c8c3b03954", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1661353537, - "narHash": "sha256-1E2IGPajOsrkR49mM5h55OtYnU0dGyre6gl60NXKITE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0e304ff0d9db453a4b230e9386418fd974d5804a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", @@ -90,15 +58,19 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_2", - "nixpkgs-22_05": "nixpkgs-22_05" + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-22_05": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1661660105, - "narHash": "sha256-3ITdkYwsNDh2DRqi7FZOJ92ui92NmcO6Nhj49u+JjWY=", + "lastModified": 1662390490, + "narHash": "sha256-HnFHRFu0eoB0tLOZRjLgVfHzK+4bQzAmAmHSzOquuyI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d92fba1bfc9f64e4ccb533701ddd8590c0d8c74a", + "rev": "044ccfe24b349859cd9efc943e4465cc993ac84e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 27c0ff7..61be3ba 100644 --- a/flake.nix +++ b/flake.nix @@ -3,13 +3,25 @@ inputs = { nixpkgs.url = github:nixos/nixpkgs/nixos-22.05; - nixos-hardware.url = github:nixos/nixos-hardware/master; + nixos-hardware = { + url = github:nixos/nixos-hardware/master; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { - #url = "github:nix-community/home-manager"; url = "https://github.com/nix-community/home-manager/archive/release-22.05.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; - sops-nix.url = github:Mic92/sops-nix; + sops-nix = { + url = github:Mic92/sops-nix; + # sops-nix uses both -22.05 and -unstable in their flake. + # As far as I can tell, 22.05 is only used for testing, whereas unstable + # is used for the tooling. So here, I let both of these follow our + # nixpkgs input. Note that after NixOS releases, this might break since + # they may do away with 22.05 at that point. + # https://github.com/Mic92/sops-nix/blob/master/flake.nix + inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-22_05.follows = "nixpkgs"; + }; }; outputs = inputs @ { self, nixpkgs, nixos-hardware, home-manager, sops-nix, ... }: