Skip to content

Commit 0dc9e6e

Browse files
authored
nixos/release-combined.nix: use 'lib' independent of 'currentSystem' (NixOS#477127)
2 parents 374cf05 + 49f36ad commit 0dc9e6e

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

nixos/release-combined.nix

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
# succeeds, and all other jobs have finished (they may fail).
44

55
{
6+
lib ? (import ../lib),
67
nixpkgs ? {
7-
outPath = (import ../lib).cleanSource ./..;
8+
outPath = lib.cleanSource ./..;
89
revCount = 56789;
910
shortRev = "gfedcba";
1011
},
@@ -28,7 +29,7 @@ let
2829
if (set.type or "") == "derivation" then
2930
set // { meta = removeAttrs (set.meta or { }) [ "maintainers" ]; }
3031
else
31-
pkgs.lib.mapAttrs (n: v: removeMaintainers v) set
32+
lib.mapAttrs (n: v: removeMaintainers v) set
3233
else
3334
set;
3435

@@ -57,7 +58,7 @@ rec {
5758
onSystems =
5859
systems: x:
5960
map (system: "${x}.${system}") (
60-
pkgs.lib.intersectLists systems (supportedSystems ++ limitedSupportedSystems)
61+
lib.intersectLists systems (supportedSystems ++ limitedSupportedSystems)
6162
);
6263
in
6364
pkgs.releaseTools.aggregate {
@@ -66,7 +67,7 @@ rec {
6667
description = "Release-critical builds for the NixOS channel";
6768
maintainers = [ ];
6869
};
69-
constituents = pkgs.lib.concatLists [
70+
constituents = lib.concatLists [
7071
[ "nixos.channel" ]
7172
(onFullSupported "nixos.dummy")
7273
(onAllSupported "nixos.iso_minimal")

0 commit comments

Comments
 (0)