diff --git a/flake.lock b/flake.lock index b15fb4e..1ed7780 100644 --- a/flake.lock +++ b/flake.lock @@ -4,7 +4,7 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ - "nixpkgs-release" + "nixpkgs" ] }, "locked": { @@ -26,7 +26,7 @@ "inputs": { "flake-utils": "flake-utils_2", "nixpkgs": [ - "nixpkgs-release" + "nixpkgs" ] }, "locked": { @@ -48,7 +48,7 @@ "inputs": { "flake-utils": "flake-utils_3", "nixpkgs": [ - "nixpkgs-release" + "nixpkgs" ] }, "locked": { @@ -147,7 +147,7 @@ "inputs": { "flake-utils": "flake-utils_4", "nixpkgs": [ - "nixpkgs-release" + "nixpkgs" ] }, "locked": { @@ -165,7 +165,7 @@ "url": "https://git.bytes.zone/brian/nates-mazes.git" } }, - "nixpkgs-release": { + "nixpkgs": { "locked": { "lastModified": 1662494299, "narHash": "sha256-1fp6BgIvuu8nLMVjAUIfaQ5DGRVoknF1/zDr2qB2p9A=", @@ -188,7 +188,7 @@ "elo-anything": "elo-anything", "goatcounter": "goatcounter", "nates-mazes": "nates-mazes", - "nixpkgs-release": "nixpkgs-release", + "nixpkgs": "nixpkgs", "sysz": "sysz" } }, diff --git a/flake.nix b/flake.nix index 036284d..91c5c44 100644 --- a/flake.nix +++ b/flake.nix @@ -2,19 +2,19 @@ description = "bytes.zone infrastructure"; inputs = { - nixpkgs-release.url = "github:NixOS/nixpkgs/release-22.05"; + nixpkgs.url = "github:NixOS/nixpkgs/release-22.05"; bad-datalog.url = "git+https://git.bytes.zone/brian/bad-datalog.git?ref=main"; - bad-datalog.inputs.nixpkgs.follows = "nixpkgs-release"; + bad-datalog.inputs.nixpkgs.follows = "nixpkgs"; bytes-zone.url = "git+https://git.bytes.zone/bytes.zone/bytes.zone.git?ref=main"; - bytes-zone.inputs.nixpkgs.follows = "nixpkgs-release"; + bytes-zone.inputs.nixpkgs.follows = "nixpkgs"; elo-anything.url = "git+https://git.bytes.zone/brian/elo-anything.git?ref=main"; - elo-anything.inputs.nixpkgs.follows = "nixpkgs-release"; + elo-anything.inputs.nixpkgs.follows = "nixpkgs"; goatcounter = { url = "github:zgoat/goatcounter/release-1.4"; @@ -23,7 +23,7 @@ nates-mazes.url = "git+https://git.bytes.zone/brian/nates-mazes.git?ref=main"; - nates-mazes.inputs.nixpkgs.follows = "nixpkgs-release"; + nates-mazes.inputs.nixpkgs.follows = "nixpkgs"; sysz = { url = "github:joehillen/sysz"; @@ -34,7 +34,7 @@ outputs = inputs: let mkOverlays = system: - let pkgs = import inputs.nixpkgs-release { inherit system; }; + let pkgs = import inputs.nixpkgs { inherit system; }; in [ inputs.bad-datalog.overlay.${system} inputs.bytes-zone.overlay.${system} @@ -72,7 +72,7 @@ }) ]; in { - nixosConfigurations.gitea = inputs.nixpkgs-release.lib.nixosSystem rec { + nixosConfigurations.gitea = inputs.nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; modules = [ @@ -82,7 +82,7 @@ }; devShells = builtins.listToAttrs (map (system: - let pkgs = import inputs.nixpkgs-release { inherit system; }; + let pkgs = import inputs.nixpkgs { inherit system; }; in { name = system; value = {