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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-23.11] netbird: 0.26.0 -> 0.27.2 #303184

Merged
merged 7 commits into from
Apr 11, 2024

Conversation

misuzu
Copy link
Contributor

@misuzu misuzu commented Apr 10, 2024

Description of changes

Now that #292069 (#301438) is merged we can properly backport netbird updates

Includes #292028 #292814 #295487 #300061 #301999 #303033

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/)
  • 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.

@LeSuisse
Copy link
Contributor

The backported commits are expected to contain the reference from the master branch. Can you cherry-picj them with git cherry-pick -x ... (that's the reason of the failure of the Check cherry-picks workflow)?

https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#how-to-backport-pull-requests

@misuzu
Copy link
Contributor Author

misuzu commented Apr 10, 2024

Can you cherry-picj them with git cherry-pick -x ... (that's the reason of the failure of the Check cherry-picks workflow)?

It should probably say this instead of #172098 (comment)
Should I leave this pull-request as-is for now for testing purposes?

@LeSuisse
Copy link
Contributor

Nope, it's fine you can fix it 👍

I'm working on the fix thanks for the report.

misuzu and others added 7 commits April 10, 2024 22:57
@misuzu
Copy link
Contributor Author

misuzu commented Apr 10, 2024

Nope, it's fine you can fix it 👍

Done, thank you!

@NickCao NickCao merged commit 423832b into NixOS:release-23.11 Apr 11, 2024
22 checks passed
@misuzu misuzu deleted the netbird-backport branch April 11, 2024 06:01
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.

4 participants