Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

meta.hydraPlatforms: allow patterns #212194

Closed
wants to merge 2 commits into from
Closed

meta.hydraPlatforms: allow patterns #212194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afdbb92
lib/systems: add doublesFromPattern(s)
Jan 22, 2023
84a84ea
meta.hydraPlatforms: allow patterns
Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions lib/systems/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,25 @@ rec {
let removeFunctions = a: lib.filterAttrs (_: v: !builtins.isFunction v) a;
in a: b: removeFunctions a == removeFunctions b;

# This function returns the elements of `systems.doubles.all`
# which match its argument, which can be either a pattern (see
# `lib.systems.inspect.patterns`) or a nix-double string. It is
# used mainly for backward compatibility with existing code that
# expects `meta.{bad,hydra,""}platforms` to be a list of strings.
doublesFromPattern = pattern:
if lib.isString pattern
then [pattern]
else lib.filter
(double: lib.meta.platformMatch (elaborate double) pattern)
doubles.all;

# like above, but applied to a (disjunctive) list, with some
# optimizations for common cases on Hydra
doublesFromPatterns = patterns:
if lib.all lib.isString patterns
then patterns
else lib.concatMap doublesFromPattern patterns;

/* List of all Nix system doubles the nixpkgs flake will expose the package set
for. All systems listed here must be supported by nixpkgs as `localSystem`.

Expand Down
2 changes: 1 addition & 1 deletion pkgs/stdenv/generic/check-meta.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ let
priority = int;
pkgConfigModules = listOf str;
platforms = listOf (either str (attrsOf anything)); # see lib.meta.platformMatch
hydraPlatforms = listOf str;
hydraPlatforms = platforms;
broken = bool;
unfree = bool;
unsupported = bool;
Expand Down
10 changes: 6 additions & 4 deletions pkgs/top-level/release-lib.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,12 @@ rec {
/* Recursively map a (nested) set of derivations to an isomorphic
set of meta.platforms values. */
packagePlatforms = mapAttrs (name: value:
if isDerivation value then
value.meta.hydraPlatforms
or (lib.subtractLists (value.meta.badPlatforms or [])
(value.meta.platforms or [ "x86_64-linux" ]))
if isDerivation value
then if value?meta.hydraPlatforms
then lib.systems.doublesFromPatterns value.meta.hydraPlatforms
else (lib.subtractLists
(lib.systems.doublesFromPatterns (value.meta.badPlatforms or []))
(value.meta.platforms or [ "x86_64-linux" ]))
else if value.recurseForDerivations or false || value.recurseForRelease or false then
packagePlatforms value
else
Expand Down