networkmanager: fix VPN activation through nm-applet #44037
Merged
Conversation
This file contains 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
|
/cc @jtojnar |
jtojnar
approved these changes
Jul 23, 2018
| @@ -76,6 +76,13 @@ in stdenv.mkDerivation rec { | |||
| url = https://bugzilla.gnome.org/attachment.cgi?id=372953; | |||
| sha256 = "1crjplyiiipkhjjlifrv6hhvxinlcxd6irp9ijbc7jij31g44i0a"; | |||
| }) | |||
| (fetchpatch { | |||
| # https://gitlab.gnome.org/GNOME/network-manager-applet/issues/12 | |||
| # should be fixed in 1.13.0 | |||
There was a problem hiding this comment.
1.13.0 would be unstable, plus Lubomir promised 1.12.2.
There was a problem hiding this comment.
updated the comment.
flokli
force-pushed
the
fix-nm-applet-vpn
branch
from
5576df4
to
379939f
Compare
9 tasks
|
added a patch on top that fixes the initial connection setup from file (in case there's no other VPN connection already configured) |
jtojnar
reviewed
Jul 24, 2018
| ]; | ||
|
|
||
| # remove again if #11 is merged |
There was a problem hiding this comment.
explicitly linked https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/15 now.
jtojnar
reviewed
Jul 24, 2018
| @@ -20,8 +20,18 @@ in stdenv.mkDerivation rec { | |||
| url = https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/12.patch; | |||
| sha256 = "0q5qbjpbrfvhqsprnwjwz4c42nly59cgnbn41w2zlxvqf29gjvwk"; | |||
| }) | |||
| (fetchpatch { | |||
| # https://gitlab.gnome.org/GNOME/network-manager-applet/issues/11 | |||
| # should be fixed in 1.8.15 | |||
There was a problem hiding this comment.
1.8.15 is a dev version (unlike rest of GNOME, NM stable versions need to have even patches in addition to even minors), next release will be 1.8.16.
There was a problem hiding this comment.
didn't knew that, ok - updated string to 1.8.16.
jtojnar
reviewed
Jul 24, 2018
| # https://gitlab.gnome.org/GNOME/network-manager-applet/issues/11 | ||
| # should be fixed in 1.8.15 | ||
| name = "show-import-file-chooser.patch"; | ||
| url = https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/15.patch; |
There was a problem hiding this comment.
We probably should not use unmerged MR for patch, as it can change. I would use the two specific commits (or commit range if it is available as a patch).
There was a problem hiding this comment.
I added all three commits separately, as the bluetooth one also shouldn't hurt and is included in the upstream MR.
flokli
force-pushed
the
fix-nm-applet-vpn
branch
from
b4d1bb7
to
a0a8d25
Compare
jtojnar
approved these changes
Jul 24, 2018
flokli
force-pushed
the
fix-nm-applet-vpn
branch
from
a0a8d25
to
14ec6e9
Compare
|
updated PR with updated upstream patches, now without |
|
@GrahamcOfBorg build networkmanagerapplet |
|
Success on x86_64-linux (full log) Attempted: networkmanagerapplet Partial log (click to expand)
|
|
Failure on aarch64-linux (full log) Attempted: networkmanagerapplet Partial log (click to expand)
|
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: networkmanagerapplet Partial log (click to expand)
|
|
@GrahamcOfBorg build networkmanagerapplet |
|
Success on x86_64-linux (full log) Attempted: networkmanagerapplet Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: networkmanagerapplet Partial log (click to expand)
|
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: networkmanagerapplet Partial log (click to expand)
|
flokli
force-pushed
the
fix-nm-applet-vpn
branch
from
14ec6e9
to
461a344
Compare
|
NetworkManager 1.12.2 was released by now, with above patch and patch in https://bugzilla.gnome.org/show_bug.cgi?id=796752 included |
flokli
force-pushed
the
fix-nm-applet-vpn
branch
from
461a344
to
cae1b12
Compare
|
@GrahamcOfBorg build networkmanager networkmanagerapplet |
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: networkmanager, networkmanagerapplet Partial log (click to expand)
|
|
Failure on x86_64-linux (full log) Attempted: networkmanager, networkmanagerapplet Partial log (click to expand)
|
|
networkmanagerapplet doesn't build anymore with the bumped networkmanager. |
|
Failure on aarch64-linux (full log) Attempted: networkmanager, networkmanagerapplet Partial log (click to expand)
|
|
I can no longer compile the openconnect plugin after applying this pull request: |
|
Yes, see above comment - I didn't receive any feedback on the upstream issue so far...
I could flip this PR back to just apply the patches as before, but we'll then still need to figure out how to bump networkmanager at a later time...
|
fix VPN activation through nm-applet (NixOS#43806), upstream bug https://gitlab.gnome.org/GNOME/network-manager-applet/issues/12
flokli
force-pushed
the
fix-nm-applet-vpn
branch
from
cae1b12
to
24726a3
Compare
|
rebased and added upstream patch for networkmanager that fixes |
|
@GrahamcOfBorg build networkmanagerapplet |
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: networkmanagerapplet Partial log (click to expand)
|
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: networkmanager Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: networkmanager Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: networkmanager Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: networkmanagerapplet Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: networkmanagerapplet Partial log (click to expand)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
Currently, activating VPN connections via nm-applet fails, but still is possible via
nmcli con up $name.That's fixed in the commit cherry-picked here, I can now activate VPN connections using nm-applet. Will be fixed in NetworkManager 1.13.0 as well.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)