rename nixpkgs-release to just nixpkgs

main
Brian Hicks 2022-09-06 15:25:32 -05:00
parent 5186549fa3
commit 47c6b4a47c
Signed by: brian
GPG Key ID: C4F324B9CAAB0D50
2 changed files with 14 additions and 14 deletions

View File

@ -4,7 +4,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-release" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -26,7 +26,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-release" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -48,7 +48,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-release" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -147,7 +147,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-release" "nixpkgs"
] ]
}, },
"locked": { "locked": {
@ -165,7 +165,7 @@
"url": "https://git.bytes.zone/brian/nates-mazes.git" "url": "https://git.bytes.zone/brian/nates-mazes.git"
} }
}, },
"nixpkgs-release": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1662494299, "lastModified": 1662494299,
"narHash": "sha256-1fp6BgIvuu8nLMVjAUIfaQ5DGRVoknF1/zDr2qB2p9A=", "narHash": "sha256-1fp6BgIvuu8nLMVjAUIfaQ5DGRVoknF1/zDr2qB2p9A=",
@ -188,7 +188,7 @@
"elo-anything": "elo-anything", "elo-anything": "elo-anything",
"goatcounter": "goatcounter", "goatcounter": "goatcounter",
"nates-mazes": "nates-mazes", "nates-mazes": "nates-mazes",
"nixpkgs-release": "nixpkgs-release", "nixpkgs": "nixpkgs",
"sysz": "sysz" "sysz": "sysz"
} }
}, },

View File

@ -2,19 +2,19 @@
description = "bytes.zone infrastructure"; description = "bytes.zone infrastructure";
inputs = { inputs = {
nixpkgs-release.url = "github:NixOS/nixpkgs/release-22.05"; nixpkgs.url = "github:NixOS/nixpkgs/release-22.05";
bad-datalog.url = bad-datalog.url =
"git+https://git.bytes.zone/brian/bad-datalog.git?ref=main"; "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 = bytes-zone.url =
"git+https://git.bytes.zone/bytes.zone/bytes.zone.git?ref=main"; "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 = elo-anything.url =
"git+https://git.bytes.zone/brian/elo-anything.git?ref=main"; "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 = { goatcounter = {
url = "github:zgoat/goatcounter/release-1.4"; url = "github:zgoat/goatcounter/release-1.4";
@ -23,7 +23,7 @@
nates-mazes.url = nates-mazes.url =
"git+https://git.bytes.zone/brian/nates-mazes.git?ref=main"; "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 = { sysz = {
url = "github:joehillen/sysz"; url = "github:joehillen/sysz";
@ -34,7 +34,7 @@
outputs = inputs: outputs = inputs:
let let
mkOverlays = system: mkOverlays = system:
let pkgs = import inputs.nixpkgs-release { inherit system; }; let pkgs = import inputs.nixpkgs { inherit system; };
in [ in [
inputs.bad-datalog.overlay.${system} inputs.bad-datalog.overlay.${system}
inputs.bytes-zone.overlay.${system} inputs.bytes-zone.overlay.${system}
@ -72,7 +72,7 @@
}) })
]; ];
in { in {
nixosConfigurations.gitea = inputs.nixpkgs-release.lib.nixosSystem rec { nixosConfigurations.gitea = inputs.nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
@ -82,7 +82,7 @@
}; };
devShells = builtins.listToAttrs (map (system: devShells = builtins.listToAttrs (map (system:
let pkgs = import inputs.nixpkgs-release { inherit system; }; let pkgs = import inputs.nixpkgs { inherit system; };
in { in {
name = system; name = system;
value = { value = {