Skip to content

nixos/oo7-service: init - #526624

Merged
HeitorAugustoLN merged 5 commits into
NixOS:masterfrom
salva09:oo7-service
Jul 10, 2026
Merged

nixos/oo7-service: init#526624
HeitorAugustoLN merged 5 commits into
NixOS:masterfrom
salva09:oo7-service

Conversation

@salva09

@salva09 salva09 commented Jun 1, 2026

Copy link
Copy Markdown
Contributor

Things done

@nixpkgs-ci
nixpkgs-ci Bot requested a review from Majiir June 1, 2026 05:45
@nixpkgs-ci nixpkgs-ci Bot added 8.has: package (new) This PR adds a new package 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jun 1, 2026
DaRacci
DaRacci reviewed Jun 23, 2026
View reviewed changes

@DaRacci DaRacci left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks solid overall, I'll do a test build of the package later.
There is also some issues picked up by the vet action that need addressing in the package.

Just one tiny nitpick.

Comment thread nixos/modules/services/desktops/oo7.nix Outdated
@salva09
salva09 force-pushed the oo7-service branch 2 times, most recently from c590496 to 923819b Compare June 24, 2026 13:23
@salva09

salva09 commented Jun 24, 2026

Copy link
Copy Markdown
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 526624
Commit: 923819b4e75e23a25c0103b5e69b169093d8a1a7

x86_64-linux

⏩ 2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
✅ 1 package built:
  • oo7-pam

1 similar comment
@DaRacci

DaRacci commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 526624
Commit: 923819b4e75e23a25c0103b5e69b169093d8a1a7

x86_64-linux

⏩ 2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
✅ 1 package built:
  • oo7-pam

DaRacci
DaRacci suggested changes Jun 25, 2026
View reviewed changes
Comment thread nixos/modules/services/desktops/oo7.nix Outdated
@nixpkgs-ci nixpkgs-ci Bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jun 26, 2026
@salva09

salva09 commented Jun 26, 2026

Copy link
Copy Markdown
Contributor Author

Thanks @DaRacci for the time you put into review this pr. I'll see if we can get it merged

Majiir
Majiir approved these changes Jul 4, 2026
View reviewed changes

@Majiir Majiir left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PAM changes LGTM

@nixpkgs-ci nixpkgs-ci Bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Jul 4, 2026
@HeitorAugustoLN HeitorAugustoLN mentioned this pull request Jul 7, 2026
Closed
13 tasks
HeitorAugustoLN
HeitorAugustoLN requested changes Jul 7, 2026
View reviewed changes
Comment thread nixos/modules/services/desktops/oo7.nix Outdated
Comment thread nixos/modules/services/desktops/oo7.nix Outdated
@HeitorAugustoLN

HeitorAugustoLN commented Jul 7, 2026

Copy link
Copy Markdown
Member

Also add a NixOS release note for the module addition

@salva09
salva09 force-pushed the oo7-service branch 3 times, most recently from 81aaac5 to edc3eca Compare July 8, 2026 13:44
@salva09
salva09 requested a review from HeitorAugustoLN July 8, 2026 13:45
@nixpkgs-ci nixpkgs-ci Bot added 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation labels Jul 8, 2026
@nyabinary

nyabinary commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

If it's not an issue for you could you take over/do your own take on #539086 it seems the author of that PR blindly vibecodes a lot of the PR as you can see here:
#517254 (comment)
#517253 (comment)
https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+author%3Acaniko+is%3Aclosed+

@nixpkgs-ci nixpkgs-ci Bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 9, 2026
HeitorAugustoLN
HeitorAugustoLN reviewed Jul 10, 2026
View reviewed changes
Comment thread nixos/modules/services/desktops/oo7.nix Outdated
DaRacci
DaRacci reviewed Jul 10, 2026
View reviewed changes
Comment thread nixos/modules/security/pam.nix Outdated
@salva09
salva09 force-pushed the oo7-service branch 2 times, most recently from b790ef3 to 6dfcfe0 Compare July 10, 2026 06:03
DaRacci
DaRacci reviewed Jul 10, 2026
View reviewed changes
Comment thread pkgs/by-name/oo/oo7-server/package.nix
isabelroses
isabelroses approved these changes Jul 10, 2026
View reviewed changes

@isabelroses isabelroses left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

im happy to merge if no one else has anything else to say

HeitorAugustoLN
HeitorAugustoLN reviewed Jul 10, 2026
View reviewed changes
Comment thread pkgs/by-name/oo/oo7-server/package.nix
@salva09
salva09 force-pushed the oo7-service branch 2 times, most recently from 8c19ce7 to d8fd046 Compare July 10, 2026 17:04
Scrumplex
Scrumplex reviewed Jul 10, 2026
View reviewed changes
Comment thread nixos/modules/services/desktops/oo7.nix
Scrumplex
Scrumplex reviewed Jul 10, 2026
View reviewed changes
Comment thread pkgs/by-name/oo/oo7-server/package.nix
Comment thread nixos/modules/services/desktops/oo7.nix
Scrumplex
Scrumplex approved these changes Jul 10, 2026
View reviewed changes

@Scrumplex Scrumplex left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes LGTM. Haven't actually tested the module though

@nixpkgs-ci nixpkgs-ci Bot added the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. label Jul 10, 2026
@HeitorAugustoLN
HeitorAugustoLN added this pull request to the merge queue Jul 10, 2026
@caniko

caniko commented Jul 10, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Fresh-login validation shows that the PAM plumbing works, but the packaged oo7 0.6.0 daemon still breaks kubelogin's Secret Service keyring backend.

The default collection is unlocked after login. kubelogin's Linux backend first checks the hard-coded /org/freedesktop/secrets/collection/login path; oo7 exposes the real collection as Login, so it falls back to /org/freedesktop/secrets/aliases/default. oo7 0.6.0 registers that alias on D-Bus but does not resolve aliases inside Unlock, causing the token-cache write to fail.

The generic fix belongs in this oo7 service/package PR, either by carrying the upstream patch until the next oo7 release or by updating to a release that contains it: server: Resolve aliases in set_locked.

A useful regression test is a fresh PAM login followed by a Secret Service client write/read through the default collection alias.

Assisted by: GPT-5.6 Luna

Merged via the queue into NixOS:master with commit 38c6aa7 Jul 10, 2026
28 checks passed
@HeitorAugustoLN HeitorAugustoLN mentioned this pull request Jul 10, 2026
Merged
13 tasks
@h7x4 h7x4 added the 8.has: module (new) This PR adds a module in `nixos/` label Jul 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Scrumplex Scrumplex Scrumplex approved these changes
@HeitorAugustoLN HeitorAugustoLN HeitorAugustoLN approved these changes
@isabelroses isabelroses isabelroses approved these changes
@getchoo getchoo Awaiting requested review from getchoo
+2 more reviewers
@DaRacci DaRacci DaRacci approved these changes
@Majiir Majiir Majiir approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (new) This PR adds a module in `nixos/` 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 3+ This PR was reviewed and approved by three or more persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

Nix documentation
Status: ✅ Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@salva09 @DaRacci @HeitorAugustoLN @nyabinary @caniko @Majiir @Scrumplex @isabelroses @h7x4