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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

[20.09] openssh_hpn: fix source #98344

Merged
merged 1 commit into from Sep 21, 2020
Merged

[20.09] openssh_hpn: fix source #98344

merged 1 commit into from Sep 21, 2020

Conversation

r-burns
Copy link
Contributor

@r-burns r-burns commented Sep 20, 2020

Backport of commit f8473b1 from #98312

Motivation for this change

ZHF 20.09 #97479

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions (Ubuntu x86_64)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from aneeshusa and edolstra September 20, 2020 21:00
@prusnak
Copy link
Member

prusnak commented Sep 20, 2020 •
edited

You should cherry-pick the commit from master using (git cherry-pick -x f8473b1) so git appends the reference to the cherry-picked commit in the commit message - see https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes for more info

@r-burns
openssh_hpn: fix source
d395c81 
(cherry picked from commit f8473b1)
@marsam marsam merged commit 40e8b26 into NixOS:release-20.09 Sep 21, 2020
@r-burns r-burns deleted the openssh_hpn_backport branch September 21, 2020 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aneeshusa aneeshusa Awaiting requested review from aneeshusa

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@r-burns @prusnak @marsam