Skip to content

Comments

sshd: fewer empty lines in generated config#392527

Merged
r-vdp merged 1 commit intoNixOS:stagingfrom
teto:teto/ssh-config-fewer-newlines
Sep 24, 2025
Merged

sshd: fewer empty lines in generated config#392527
r-vdp merged 1 commit intoNixOS:stagingfrom
teto:teto/ssh-config-fewer-newlines

Conversation

@teto
Copy link
Member

@teto teto commented Mar 23, 2025

Things done

  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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.

@github-actions github-actions bot added 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/` 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 23, 2025
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 2, 2025
@r-vdp
Copy link
Contributor

r-vdp commented May 5, 2025

I like this! Could you rebase on top of master? If not, I don't mind doing it myself either.

@teto
Copy link
Member Author

teto commented May 5, 2025

please go ahead. I am adapting my workflow to https://jj-vcs.github.io/ and while I managed to rebase,I seem to have a big diff, mostly around whitespaces and i am not sure if it's expected or not.

@r-vdp r-vdp force-pushed the teto/ssh-config-fewer-newlines branch 2 times, most recently from 491cebc to a25bd13 Compare May 8, 2025 18:13
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label May 9, 2025
@r-vdp r-vdp force-pushed the teto/ssh-config-fewer-newlines branch from a25bd13 to 027c7f3 Compare May 11, 2025 22:53
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 9, 2025
@r-vdp r-vdp force-pushed the teto/ssh-config-fewer-newlines branch from 027c7f3 to 8e0841a Compare June 17, 2025 12:27
@r-vdp r-vdp removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 17, 2025
@teto
Copy link
Member Author

teto commented Jun 23, 2025

I am reluctant to merge anything related to ssh (and it would be a shameful self-merge on top-of that). I believe it looks ok ?

@nixpkgs-ci nixpkgs-ci bot added the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Jul 4, 2025
@teto
Copy link
Member Author

teto commented Sep 3, 2025

bump for review/merge

@r-vdp r-vdp force-pushed the teto/ssh-config-fewer-newlines branch from 8e0841a to 416b18b Compare September 19, 2025 10:04
@r-vdp r-vdp requested a review from NyCodeGHG September 19, 2025 10:04
Copy link
Contributor

@r-vdp r-vdp left a comment

Choose a reason for hiding this comment

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

LGTM! I have been using this on my machines for several months now without issues.

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 1 This PR was reviewed and approved by one person. 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches. and removed 9.needs: reviewer This PR currently has no reviewers requested and needs attention. labels Sep 19, 2025
@r-vdp r-vdp force-pushed the teto/ssh-config-fewer-newlines branch from 416b18b to affaff1 Compare September 19, 2025 10:16
@r-vdp r-vdp changed the base branch from master to staging September 19, 2025 10:16
@nixpkgs-ci nixpkgs-ci bot closed this Sep 19, 2025
@nixpkgs-ci nixpkgs-ci bot reopened this Sep 19, 2025
Co-authored-by: r-vdp <ramses@well-founded.dev>
Co-authored-by:  Marie <tabmeier12@gmail.com>
@r-vdp r-vdp force-pushed the teto/ssh-config-fewer-newlines branch from 944f2a4 to 7ebfdde Compare September 21, 2025 23:03
@r-vdp r-vdp dismissed NyCodeGHG’s stale review September 21, 2025 23:04

Requested changes were incorporated

@r-vdp r-vdp requested a review from NyCodeGHG September 21, 2025 23:04
@qweered

This comment has been minimized.

@r-vdp
Copy link
Contributor

r-vdp commented Sep 22, 2025

@qweered I don't think nixpkgs review is meaningful for changes to modules, since no packages are affected by this.

@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 Sep 22, 2025
@r-vdp r-vdp merged commit 2f5e64c into NixOS:staging Sep 24, 2025
30 of 32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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/` 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants