headscale: backport BaseDomain and ServerURL checks#358255
Merged
wolfgangwalther merged 1 commit intoNixOS:masterfrom Jan 3, 2025
Merged
headscale: backport BaseDomain and ServerURL checks#358255wolfgangwalther merged 1 commit intoNixOS:masterfrom
wolfgangwalther merged 1 commit intoNixOS:masterfrom
Conversation
13 tasks
motiejus
force-pushed
the
headscale-backport-serverurl
branch
from
7b6c732 to
454d3e9
Compare
ofborg
bot
added
10.rebuild-darwin: 1-10
Contributor
|
Contributor
Author
Not sure. The paches are not related to Darwin, but the package seems to be not excluded from it (and I don't see why it shouldn't). I'll try rebasing, maybe something had changed in the meanwhile. |
Currently users upgrading from 24.05 to 24.11 may stumble across an overly-restrictive BaseURL and ServerURL check in headscale[1]. A fix has been merged upstream[2], this is backport, so users can have it easier upgrading from 24.05 to 24.11 or unstable. The patch does not apply cleanly on v0.23.0, so putting it here instead. Supersedes NixOS#357969, this will be backported to 24.11 with a tag. [1]: juanfont/headscale#2210 [2]: juanfont/headscale#2248
motiejus
force-pushed
the
headscale-backport-serverurl
branch
from
454d3e9 to
f1bdc12
Compare
github-actions
bot
removed
10.rebuild-darwin: 1
Contributor
Seems to be a sandbox related failure that happens on master, too, so not a blocker. |
ofborg
bot
added
10.rebuild-darwin: 1
Contributor
|
Contributor
|
Ran into this while upgrading. Can we get this merged please :) |
Contributor
|
Successfully created backport PR for |
1 task
| }; | ||
|
|
||
| # Merged post-v0.23.0, so should be removed with next release. | ||
| patches = [ ./patches/config-loosen-up-BaseDomain-and-ServerURL-checks.patch ]; |
Member
There was a problem hiding this comment.
patches don't need to be in a subdirectory
13 tasks
Contributor
Author
|
Here is a follow-up that removes the Nix assertion: #374374 |
motiejus
added a commit
to motiejus/nixpkgs
that referenced
this pull request
Jan 17, 2025
server_url check [has been loosened upstream][1] and backported to NixOS[2]. The new, much looser check, is not practical to be implemented in Nix (you are welcome to give it a try; I've implemented the original one). Since the surface area is much smaller now (and the scenario much less common), I think we can remove this assertion altogether. [1]: juanfont/headscale#2248 [2]: NixOS#358255
nixpkgs-ci bot
pushed a commit
that referenced
this pull request
Jan 17, 2025
server_url check [has been loosened upstream][1] and backported to NixOS[2]. The new, much looser check, is not practical to be implemented in Nix (you are welcome to give it a try; I've implemented the original one). Since the surface area is much smaller now (and the scenario much less common), I think we can remove this assertion altogether. [1]: juanfont/headscale#2248 [2]: #358255 (cherry picked from commit de0a499)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Currently users upgrading from 24.05 to 24.11 may stumble across an overly-restrictive BaseURL and ServerURL check in headscale1.
A fix has been merged upstream2, this is backport, so users can have it easier upgrading from 24.05 to 24.11 or unstable.
The patch does not apply cleanly on v0.23.0, so putting it here instead.
Supersedes #357969, this will be backported to 24.11 with a tag.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)