treewide: switch instances of lib.teams.*.members to the new meta.teams attribute#400458
Merged
numinit merged 2 commits intoNixOS:masterfrom Apr 26, 2025
Merged
treewide: switch instances of lib.teams.*.members to the new meta.teams attribute#400458numinit merged 2 commits intoNixOS:masterfrom
numinit merged 2 commits intoNixOS:masterfrom
Conversation
github-actions
bot
added
6.topic: python
13 tasks
SigmaSquadron
added a commit
to SigmaSquadron/nixpkgs
that referenced
this pull request
Apr 26, 2025
This was an edge case that NixOS#400458 missed, as there was no reason to evaluate NixOS configurations during the review process. This fixes the meta attribute inheritance in the wrapped version of `xfce.thunar`, which would only be called by a NixOS module, and does not appear in the main package set. Reported-by: stormytuna <[email protected]> Signed-off-by: Fernando Rodrigues <[email protected]>
Member
|
This broke eval of packages under nextcloud30Packages.apps with: and also of varnish60Packages.{digest,dynamic,modules}: |
Contributor
|
@jopejoe1 I think this should work, it just didn't match any previous use patterns. diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix
index ccc079b70204..31f35c0568d3 100644
--- a/pkgs/build-support/fetchnextcloudapp/default.nix
+++ b/pkgs/build-support/fetchnextcloudapp/default.nix
@@ -16,6 +16,7 @@
description ? null,
homepage ? null,
maintainers ? [ ],
+ teams ? [ ],
unpack ? false, # whether to use fetchzip rather than fetchurl
}:
applyPatches (
@@ -27,7 +28,7 @@ applyPatches (
{
license = lib.licenses.${license};
longDescription = description;
- inherit homepage maintainers;
+ inherit homepage maintainers teams;
}
// lib.optionalAttrs (description != null) {
longDescription = description; |
13 tasks
numinit
pushed a commit
that referenced
this pull request
Apr 27, 2025
Another edge case of #400458. Reported-by: jopejoe1 <[email protected]> Signed-off-by: Fernando Rodrigues <[email protected]>
numinit
pushed a commit
that referenced
this pull request
Apr 27, 2025
Another edge case of #400458. Reported-by: jopejoe1 <[email protected]> Signed-off-by: Fernando Rodrigues <[email protected]>
jtojnar
added a commit
to nix-community/nixpkgs-update
that referenced
this pull request
Apr 28, 2025
NixOS/nixpkgs#400458 broke this by replacing `meta.maintainers = [ teams.gnome.members ]` with `meta.teams = [ teams.gnome ]`
rhendric
pushed a commit
to nix-community/nixpkgs-update
that referenced
this pull request
Apr 28, 2025
NixOS/nixpkgs#400458 broke this by replacing `meta.maintainers = [ teams.gnome.members ]` with `meta.teams = [ teams.gnome ]`
mkg20001
pushed a commit
to mkg20001/nixpkgs
that referenced
this pull request
Apr 29, 2025
This was an edge case that NixOS#400458 missed, as there was no reason to evaluate NixOS configurations during the review process. This fixes the meta attribute inheritance in the wrapped version of `xfce.thunar`, which would only be called by a NixOS module, and does not appear in the main package set. Reported-by: stormytuna <[email protected]> Signed-off-by: Fernando Rodrigues <[email protected]>
Contributor
|
Nixos package search doesn't pull the teams members anymore, so now there are lots of packages with missing maintainer information. |
Member
|
We need to PR for nixos-search. |
Member
|
Already mentioned, NixOS/nixos-search#914. This PR just needs someone who is knowledgeable with NixOS search to figure out how to test it. |
Contributor
Sorry, was hidden by github... |
This was referenced Apr 30, 2025
Member
|
Repology now has a PR to make things visible again repology/repology-updater#1492 |
This was referenced Apr 30, 2025
tscolari
reviewed
May 4, 2025
winterqt
pushed a commit
that referenced
this pull request
May 7, 2025
This is a work-around that resolves the issues that spawned from #400458 by adding the team members from teams declared in `meta.teams` to `meta.maintainers`, effectively restoring the original behaviour of the `maintainers` attribute, and thus allowing downstreams to keep consuming `meta.maintainers` without any extra changes to support `meta.teams`. Follow-up to #394797. Signed-off-by: Fernando Rodrigues <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #394797.
This is my first treewide, and I don't think I broke anything, but I would appreciate a thorough review.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.