diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-31 00:02:31 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-31 00:02:31 +0000 |
commit | dd1ff149da07cd25a3e0152c67184e049256fcf1 (patch) | |
tree | 98dd4e2a8ffa16ee3990d1610053bfbcd2003dc8 /pkgs/stdenv | |
parent | 7b0719bd7411ffe9935af524729055f58fa6a537 (diff) | |
parent | fe85b09c8be67eb08edbe43122a0301b62a40ef0 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 94998bbfa0fee..751e19d1681ae 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -271,7 +271,7 @@ let sourceProvenance = listOf lib.types.attrs; maintainers = listOf (attrsOf anything); # TODO use the maintainer type from lib/tests/maintainer-module.nix priority = int; - platforms = listOf (oneOf [ str (attrsOf anything) (functionTo bool) ]); # see lib.meta.platformMatch + platforms = listOf (either str (attrsOf anything)); # see lib.meta.platformMatch hydraPlatforms = listOf str; broken = bool; unfree = bool; |