archives/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-03-08 01:24:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nixos/release-combined.nix: use 'lib' independent of 'currentSystem'

Browse source
This commit is contained in:
Arnout Engelen 2025-12-16 11:29:46 +01:00
parent 88d3861acd
commit 49f36ad75b
No known key found for this signature in database
GPG key ID: 061107B0F74A6DAA
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nixos/release-combined.nix
View file

@ -3,8 +3,9 @@
# succeeds, and all other jobs have finished (they may fail).
{
lib ? (import ../lib),
nixpkgs ? {
outPath = (import ../lib).cleanSource ./..;
outPath = lib.cleanSource ./..;
revCount = 56789;
shortRev = "gfedcba";
},
@ -28,7 +29,7 @@ let
if (set.type or "") == "derivation" then
set // { meta = removeAttrs (set.meta or { }) [ "maintainers" ]; }
else
pkgs.lib.mapAttrs (n: v: removeMaintainers v) set
lib.mapAttrs (n: v: removeMaintainers v) set
else
set;
@ -57,7 +58,7 @@ rec {
onSystems =
systems: x:
map (system: "${x}.${system}") (
pkgs.lib.intersectLists systems (supportedSystems ++ limitedSupportedSystems)
lib.intersectLists systems (supportedSystems ++ limitedSupportedSystems)
);
in
pkgs.releaseTools.aggregate {
@ -66,7 +67,7 @@ rec {
description = "Release-critical builds for the NixOS channel";
maintainers = [ ];
};
constituents = pkgs.lib.concatLists [
constituents = lib.concatLists [
[ "nixos.channel" ]
(onFullSupported "nixos.dummy")
(onAllSupported "nixos.iso_minimal")