Add meta.teams support by RossComputerGuy · Pull Request #914 · NixOS/nixos-search

RossComputerGuy · 2025-04-21T06:01:41Z

Fixes #907

We should get this close with NixOS/nixpkgs#400458.

My lack of experience with rust got me some progress but I couldn't get past this error:

flake-info> error[E0277]: the trait bound `export::Maintainer: From<OneOrMany<import::Maintainer>>` is not satisfied
flake-info>    --> src/data/export.rs:387:42
flake-info>     |
flake-info> 387 |                 members: members.map(|m| Maintainer::from(m)),
flake-info>     |                                          ^^^^^^^^^^ the trait `From<OneOrMany<import::Maintainer>>` is not implemented for `export::Maintainer`
flake-info>     |
flake-info>     = help: the following other types implement trait `From<T>`:
flake-info>               `export::Maintainer` implements `From<flake::Flake>`
flake-info>               `export::Maintainer` implements `From<import::Maintainer>`
flake-info>
flake-info> error[E0308]: mismatched types
flake-info>    --> src/data/export.rs:387:26
flake-info>     |
flake-info> 387 |                 members: members.map(|m| Maintainer::from(m)),
flake-info>     |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `Option<OneOrMany<Maintainer>>`, found `Option<Maintainer>`
flake-info>     |
flake-info>     = note: expected enum `std::option::Option<OneOrMany<export::Maintainer>>`
flake-info>                found enum `std::option::Option<export::Maintainer>`
flake-info>
flake-info> Some errors have detailed explanations: E0277, E0308.
flake-info> For more information about an error, try `rustc --explain E0277`.
flake-info> error: could not compile `flake-info` (lib) due to 2 previous errors

So whoever reviews this needs to know Rust. We need members to be a list because that's what it is in Nix. But it doesn't return OneOrMany applied to the mapped list.

RossComputerGuy · 2025-04-22T02:54:16Z

I figured out a solution to the error.

raboof

Intent is 👍 , one question about the code, haven't tested.

raboof · 2025-04-22T07:01:12Z

flake-info/src/data/export.rs

+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[allow(non_snake_case)]
+pub struct Team {
+    members: Option<OneOrMany<Maintainer>>,


I'm not super familiar with this codebase yet, but I wonder if it wouldn't be simpler for this to be a Vec (or Option<Vec>) here?

Would be much simpler, yes. Specifically Option<OneOrMany<T>> sounds like a complicated way to specify Vec<T>. Perhaps it has benefits when (de-)serializing.

Option<OneOrMany<T>> is done in many other places so I used it because of that

I had the impression that it is used in the contract between the 'nix side' and 'flake-info', but not between 'flake-info' and elasticsearch model - and that this struct is used for the latter. As said I'm not super familiar with this codebase yet, though, so I could be mistaken.

Yeah, I'm not sure either. I think it does everything lol.

is import.rs the 'nix side' and export.rs the 'elasticsearch side'?

my guess was that OneOrMany would support both "foo" and [ "foo" "bar" ] due to nix being flexibly typed, but we can be a bit more strict on our 'own' side.

I have no idea lol.

RossComputerGuy · 2025-04-26T05:46:28Z

NixOS/nixpkgs#400458 was just merged, we should get this PR before it hits nixos-unstable and entries disappear from https://search.nixos.org.

raboof · 2025-04-26T10:09:10Z

I'm not a huge fan of merging this feature without figuring out whether that OneOrMany complexity is really needed there, but I suppose it's better than losing maintainer information.

How have you tested this change?

raboof · 2025-04-26T10:46:31Z

I tried testing this with the gitlab-container-registry package, but after uploading that package, the query generated by the frontend can't find it at all anymore. Could you have a look at that?

RossComputerGuy · 2025-04-26T13:09:36Z

How have you tested this change?

I haven't tried testing it because idk how to test this and the README doesn't help.

raboof · 2025-04-26T13:24:57Z

Makes sense. I didn't either and spent this morning figuring it out, created #915 / #916 / #917 / #918

I'm afraid I probably won't find time to figure out why gitlab-container-registry no longer shows up for me after applying your change any time soon.

so it works even for teams that don't have GitHub teams

raboof · 2025-05-06T13:51:53Z

The page now shows "This package has no maintainers. If you find it useful, please consider becoming a maintainer!" in the "Maintainers" section when the package has no individual maintainers but only teams - that might be something to fix as well?

raboof · 2025-05-06T13:52:36Z

I have proposed two fixes for this PR in RossComputerGuy#1 and RossComputerGuy#2

meta.teams support: show team name

meta.teams support: fix export

raboof

let's give this a try 🤞

RossComputerGuy · 2025-05-06T19:15:37Z

Doesn't work, got this error: Expecting an OBJECT with a field named 'package_teams'

raboof · 2025-05-06T19:38:32Z

can you PR an update changing the VERSION file in the root to '43'?

RossComputerGuy · 2025-05-06T19:47:09Z

Oh, I can't right now... I can in about 6 hours.

RossComputerGuy mentioned this pull request Apr 21, 2025

treewide: switch instances of lib.teams.*.members to the new meta.teams attribute NixOS/nixpkgs#400458

Merged

13 tasks

RossComputerGuy force-pushed the feat/meta-teams branch 4 times, most recently from d8a17dd to ffec7f1 Compare April 22, 2025 02:50

Add meta.teams support

f62fe36

RossComputerGuy force-pushed the feat/meta-teams branch from ffec7f1 to f62fe36 Compare April 22, 2025 03:45

raboof reviewed Apr 22, 2025

View reviewed changes

raboof added 2 commits May 5, 2025 14:46

meta.teams support: fix export

7438a23

meta.teams support: show team name

d8c1bc9

so it works even for teams that don't have GitHub teams

RossComputerGuy added 2 commits May 6, 2025 11:48

Merge pull request #2 from raboof/feat/meta-teams-fix-show-team-name

b9a8d8d

meta.teams support: show team name

Merge pull request #1 from raboof/feat/meta-teams-fix-export

790d024

meta.teams support: fix export

raboof approved these changes May 6, 2025

View reviewed changes

raboof merged commit f8dec63 into NixOS:main May 6, 2025
3 checks passed

RossComputerGuy deleted the feat/meta-teams branch May 6, 2025 19:13

raboof mentioned this pull request May 6, 2025

Bad Body error on all search results #925

Closed

Uh oh!

Conversation

RossComputerGuy commented Apr 21, 2025

Uh oh!

RossComputerGuy commented Apr 22, 2025

Uh oh!

raboof left a comment

Choose a reason for hiding this comment

Uh oh!

raboof Apr 22, 2025

Choose a reason for hiding this comment

Uh oh!

FliegendeWurst Apr 22, 2025

Choose a reason for hiding this comment

Uh oh!

RossComputerGuy Apr 22, 2025

Choose a reason for hiding this comment

Uh oh!

raboof Apr 22, 2025

Choose a reason for hiding this comment

Uh oh!

RossComputerGuy Apr 22, 2025

Choose a reason for hiding this comment

Uh oh!

raboof Apr 22, 2025

Choose a reason for hiding this comment

Uh oh!

RossComputerGuy Apr 22, 2025

Choose a reason for hiding this comment

Uh oh!

RossComputerGuy commented Apr 26, 2025

Uh oh!

raboof commented Apr 26, 2025

Uh oh!

raboof commented Apr 26, 2025

Uh oh!

RossComputerGuy commented Apr 26, 2025

Uh oh!

raboof commented Apr 26, 2025

Uh oh!

raboof commented May 6, 2025

Uh oh!

raboof commented May 6, 2025

Uh oh!

raboof left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

RossComputerGuy commented May 6, 2025

Uh oh!

raboof commented May 6, 2025

Uh oh!

RossComputerGuy commented May 6, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants