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.

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

Already on GitHub? Sign in to your account

openssh: build with correct passwd path #308325

Merged
merged 1 commit into from
May 17, 2024
Merged

Conversation

wlcx
Copy link
Contributor

@wlcx wlcx commented May 1, 2024

Description of changes

Tentative fix for #308247

Points openssh at nixos' passwd so it can allow users to change expired passwords on login

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 馃憤 reaction to pull requests you find important.

@eclairevoyant
Copy link
Member

As this is a change to openssh which requires massive rebuilds, the PR should go to staging.
Please ensure to rebase (do not simply change the branch target!) as per the contribution guidelines here: https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging

Marking as draft in the meantime.

@wlcx wlcx changed the base branch from master to staging May 1, 2024 21:09
@wlcx
Copy link
Contributor Author

wlcx commented May 1, 2024

Just realised I did exactly what you said not to do. Will sort shortly.

@SuperSandro2000
Copy link
Member

As this is a change to openssh which requires massive rebuilds

That was true in the past but we are now below 500 rebuilds which is generally fine to go master. The general rule of thumb is, that when the rebuild counts are red, it needs to to go to staging.

@SuperSandro2000 SuperSandro2000 marked this pull request as ready for review May 1, 2024 22:03
@wlcx
Copy link
Contributor Author

wlcx commented May 1, 2024

Ok... so back against master then?

@wlcx wlcx changed the base branch from staging to master May 1, 2024 23:37
@wlcx wlcx mentioned this pull request May 2, 2024
13 tasks
} // lib.optionalAttrs isNixos {
# openssh calls passwd to allow the user to reset an expired password, but nixos
# doesn't ship it at /usr/bin/passwd.
PATH_PASSWD_PROG = "/run/wrappers/bin/passwd";
Copy link
Member

Choose a reason for hiding this comment

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

I always find it a bit cleaner to not use optionalAttrs for such things. We can probably place this inside of env and use optionalAttrs there. What do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, that's much nicer. Wasn't aware of env!

@lukegb lukegb merged commit 402031b into NixOS:master May 17, 2024
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants