colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

flake: remove separate nixpkgs-staging and staging-next

Browse Source
This commit is contained in:
Colin 2023-12-11 22:33:38 +00:00
parent 49235a4d83
commit 1bd2d0dfc1
2 changed files with 19 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
flake.lock
View File

@ -35,23 +35,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-next-unpatched": {
"locked": {
"lastModified": 1702148972,
"narHash": "sha256-h2jODFP6n+ABrUWcGRSVPRFfLOkM9TJ2pO+h+9JcaL0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b8f33c044e51de6dde3ad80a9676945e0e4e3227",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-staging-next-unpatched": {
"locked": { "locked": {
"lastModified": 1702317658, "lastModified": 1702317658,
"narHash": "sha256-jYzBIMW18oQG+uQ9TVZwiYFHVafYIqllW+zFLROtwcE=", "narHash": "sha256-jYzBIMW18oQG+uQ9TVZwiYFHVafYIqllW+zFLROtwcE=",
@ -67,18 +51,18 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-staging-unpatched": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1702311933, "lastModified": 1702148972,
"narHash": "sha256-bARcUNREf0wVSYzWhcK+mKCUgzeHbiKKDbpHBH92Mdk=", "narHash": "sha256-h2jODFP6n+ABrUWcGRSVPRFfLOkM9TJ2pO+h+9JcaL0=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "14b1b887952e70c12c6b8fc4ee9c1e22ec32faa6", "rev": "b8f33c044e51de6dde3ad80a9676945e0e4e3227",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "staging", "ref": "release-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -102,8 +86,7 @@
"root": { "root": {
"inputs": { "inputs": {
"mobile-nixos": "mobile-nixos", "mobile-nixos": "mobile-nixos",
"nixpkgs-staging-next-unpatched": "nixpkgs-staging-next-unpatched", "nixpkgs-next-unpatched": "nixpkgs-next-unpatched",
"nixpkgs-staging-unpatched": "nixpkgs-staging-unpatched",
"nixpkgs-unpatched": "nixpkgs-unpatched", "nixpkgs-unpatched": "nixpkgs-unpatched",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"uninsane-dot-org": "uninsane-dot-org" "uninsane-dot-org": "uninsane-dot-org"

26
flake.nix
View File

@ -29,7 +29,7 @@
# - daily: # - daily:
# - nixos-unstable cut from master after enough packages have been built in caches. # - nixos-unstable cut from master after enough packages have been built in caches.
# - every 6 hours: # - every 6 hours:
# - master auto-merged into staging. # - master auto-merged into staging and staging-next
# - staging-next auto-merged into staging. # - staging-next auto-merged into staging.
# - manually, approximately once per month: # - manually, approximately once per month:
# - staging-next is cut from staging. # - staging-next is cut from staging.
@ -44,8 +44,9 @@
# <https://github.com/nixos/nixpkgs/tree/nixos-unstable> # <https://github.com/nixos/nixpkgs/tree/nixos-unstable>
# nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable"; # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable";
nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=master"; nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=master";
nixpkgs-staging-next-unpatched.url = "github:nixos/nixpkgs?ref=staging-next"; # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-staging";
nixpkgs-staging-unpatched.url = "github:nixos/nixpkgs?ref=staging"; # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-staging-next";
nixpkgs-next-unpatched.url = "github:nixos/nixpkgs?ref=staging-next";
mobile-nixos = { mobile-nixos = {
# <https://github.com/nixos/mobile-nixos> # <https://github.com/nixos/mobile-nixos>
@ -74,8 +75,7 @@
outputs = { outputs = {
self, self,
nixpkgs-unpatched, nixpkgs-unpatched,
nixpkgs-staging-unpatched ? null, nixpkgs-next-unpatched ? nixpkgs-unpatched,
nixpkgs-staging-next-unpatched ? null,
mobile-nixos, mobile-nixos,
sops-nix, sops-nix,
uninsane-dot-org, uninsane-dot-org,
@ -153,18 +153,12 @@
moby-light = { name = "moby"; local = "x86_64-linux"; target = "aarch64-linux"; light = true; }; moby-light = { name = "moby"; local = "x86_64-linux"; target = "aarch64-linux"; light = true; };
rescue = { name = "rescue"; local = "x86_64-linux"; target = "x86_64-linux"; }; rescue = { name = "rescue"; local = "x86_64-linux"; target = "x86_64-linux"; };
}; };
stagingHosts = mapAttrs' (h: v: { hostsNext = mapAttrs' (h: v: {
name = "${h}-staging"; name = "${h}-next";
value = v // { nixpkgs = patchNixpkgs "staging" nixpkgs-staging-unpatched; }; value = v // { nixpkgs = patchNixpkgs "staging-next" nixpkgs-next-unpatched; };
}) hosts;
stagingNextHosts = mapAttrs' (h: v: {
name = "${h}-staging-next";
value = v // { nixpkgs = patchNixpkgs "staging-next" nixpkgs-staging-next-unpatched; };
}) hosts; }) hosts;
in mapAttrValues evalHost ( in mapAttrValues evalHost (
hosts // hosts // hostsNext
(optionalAttrs (nixpkgs-staging-unpatched != null) stagingHosts) //
(optionalAttrs (nixpkgs-staging-next-unpatched != null) stagingNextHosts)
); );
# unofficial output # unofficial output
@ -491,7 +485,7 @@
}; };
check.hostConfigs = checkHostConfigsApp ""; check.hostConfigs = checkHostConfigsApp "";
check.hostConfigsNext = checkHostConfigsApp "-staging-next"; check.hostConfigsNext = checkHostConfigsApp "-next";
check.rescue = { check.rescue = {
type = "app"; type = "app";