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

networkmanager-l2tp: 1.2.4 -> 1.2.8 #31506

Merged
merged 1 commit into from Dec 11, 2017
Merged

networkmanager-l2tp: 1.2.4 -> 1.2.8 #31506

merged 1 commit into from Dec 11, 2017

Conversation

c0bw3b
Copy link
Contributor

@c0bw3b c0bw3b commented Nov 10, 2017

Motivation for this change

Package update
Closes: #28546

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@c0bw3b
Copy link
Contributor Author

c0bw3b commented Nov 10, 2017

@abbradar @obadz as maintainers

@Mic92 @joachifm who were reviewing that previous PR

@abbradar
Copy link
Member

Looks good for me. I don't have an L2TP server to test with it nowadays. Have you tested it?

@c0bw3b
Copy link
Contributor Author

c0bw3b commented Nov 11, 2017

No same situation I don't have what's needed to test it

@abbradar
Copy link
Member

abbradar commented Nov 11, 2017 •
edited

Let's wait for some time, maybe someone else can test this...

EDIT: to not stall this: say till Tuesday.

@teto
Copy link
Member

teto commented Nov 11, 2017

l2tp+strongswan has several flaws in nixos. I have a working setup with #31019 (which also bumps l2tp btw) but I have some errors in the module I described in the PR.

@disassembler
Copy link
Member

@nixborg build

@nixborg
Copy link

nixborg commented Nov 12, 2017

@disassembler is not a committer

@obadz
Copy link
Contributor

obadz commented Nov 12, 2017

I don't use l2tp but I think setting up a server is just a matter of services.xl2tpd.enable = true + editing /etc/xl2tpd/ppp/chap-secrets.

@c0bw3b
Copy link
Contributor Author

c0bw3b commented Nov 12, 2017

@teto I did check quickly but I missed that your PR was already upgrading that package, my bad.

It seems #31019 still needs to figure out some points regarding Strongswan service module.
Either I close this and we wait for your PR to reach completion, or we split the nm-l2tp update here and let your PR focus on Strongswan alone. I'm good with both scenarios.

@teto
Copy link
Member

teto commented Nov 12, 2017

@c0bw3b the strongswan PR is likely to sit for a long time (I was apparently the first nixos user of an l2tp vpn) so let's keep this PR and I will update mine once this one gets merged.

@c0bw3b
Copy link
Contributor Author

c0bw3b commented Nov 12, 2017

Ok perfect. :)
I will enhance this slightly by shamelessly peeking at your PR so that you won't need to modify it later (hopefully)

@disassembler
Copy link
Member

@GrahamcOfBorg build networkmanager_l2tp

GrahamcOfBorg
GrahamcOfBorg reviewed Nov 15, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

(use ‘--show-trace’ to show detailed location information)

GrahamcOfBorg
GrahamcOfBorg approved these changes Nov 15, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

shrinking /nix/store/qk5lrcb4pwkfgksfma3412b7l494smyb-NetworkManager-l2tp-gnome-1.2.8/libexec/nm-l2tp-service
shrinking /nix/store/qk5lrcb4pwkfgksfma3412b7l494smyb-NetworkManager-l2tp-gnome-1.2.8/libexec/nm-l2tp-auth-dialog
shrinking /nix/store/qk5lrcb4pwkfgksfma3412b7l494smyb-NetworkManager-l2tp-gnome-1.2.8/lib/NetworkManager/libnm-l2tp-properties.so
shrinking /nix/store/qk5lrcb4pwkfgksfma3412b7l494smyb-NetworkManager-l2tp-gnome-1.2.8/lib/NetworkManager/libnm-vpn-plugin-l2tp-editor.so
shrinking /nix/store/qk5lrcb4pwkfgksfma3412b7l494smyb-NetworkManager-l2tp-gnome-1.2.8/lib/NetworkManager/libnm-vpn-plugin-l2tp.so
shrinking /nix/store/qk5lrcb4pwkfgksfma3412b7l494smyb-NetworkManager-l2tp-gnome-1.2.8/lib/pppd/2.4.7/nm-l2tp-pppd-plugin.so
stripping (with flags -S) in /nix/store/qk5lrcb4pwkfgksfma3412b7l494smyb-NetworkManager-l2tp-gnome-1.2.8/lib  /nix/store/qk5lrcb4pwkfgksfma3412b7l494smyb-NetworkManager-l2tp-gnome-1.2.8/libexec 
patching script interpreter paths in /nix/store/qk5lrcb4pwkfgksfma3412b7l494smyb-NetworkManager-l2tp-gnome-1.2.8
checking for references to /tmp/nix-build-NetworkManager-l2tp-gnome-1.2.8.drv-0 in /nix/store/qk5lrcb4pwkfgksfma3412b7l494smyb-NetworkManager-l2tp-gnome-1.2.8...
/nix/store/qk5lrcb4pwkfgksfma3412b7l494smyb-NetworkManager-l2tp-gnome-1.2.8

@c0bw3b
Copy link
Contributor Author

c0bw3b commented Nov 15, 2017 •
edited

@disassembler I will set platforms.linux just like networkmanager itself
EDIT: oh wait it already inherits networkmanager's meta.platforms
So Borg failure on Darwin should be considered normal here?

@c0bw3b
Copy link
Contributor Author

c0bw3b commented Nov 15, 2017

Just fixed: configure flags eval failed when called with withGnome = false

Now it builds properly:

Build configuration: 
  --with-gnome=no
  --with-libnm-glib=no
  --enable-absolute-paths=no
  --enable-more-warnings=
  --enable-lto=no
  --enable-ld-gc=yes

@garbas
Copy link
Member

garbas commented Dec 10, 2017

@GrahamcOfBorg build networkmanager_l2tp

@grahamc
Copy link
Member

grahamc commented Dec 10, 2017

@garbas unfortunately you can't trigger the bot yet :) I'll fix that soon!

@garbas
Copy link
Member

garbas commented Dec 10, 2017

@grahamc tnx!

/me is too excited to finally have an evening of hacking after 8 months :)

@garbas
Copy link
Member

garbas commented Dec 10, 2017

@GrahamcOfBorg build networkmanager_l2tp

GrahamcOfBorg
GrahamcOfBorg reviewed Dec 10, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

shrinking /nix/store/xyn9vkh191bfv73g2306r866v26xw53p-NetworkManager-l2tp-gnome-1.2.8/libexec/nm-l2tp-service
shrinking /nix/store/xyn9vkh191bfv73g2306r866v26xw53p-NetworkManager-l2tp-gnome-1.2.8/libexec/nm-l2tp-auth-dialog
shrinking /nix/store/xyn9vkh191bfv73g2306r866v26xw53p-NetworkManager-l2tp-gnome-1.2.8/lib/NetworkManager/libnm-l2tp-properties.so
shrinking /nix/store/xyn9vkh191bfv73g2306r866v26xw53p-NetworkManager-l2tp-gnome-1.2.8/lib/NetworkManager/libnm-vpn-plugin-l2tp-editor.so
shrinking /nix/store/xyn9vkh191bfv73g2306r866v26xw53p-NetworkManager-l2tp-gnome-1.2.8/lib/NetworkManager/libnm-vpn-plugin-l2tp.so
shrinking /nix/store/xyn9vkh191bfv73g2306r866v26xw53p-NetworkManager-l2tp-gnome-1.2.8/lib/pppd/2.4.7/nm-l2tp-pppd-plugin.so
stripping (with flags -S) in /nix/store/xyn9vkh191bfv73g2306r866v26xw53p-NetworkManager-l2tp-gnome-1.2.8/lib  /nix/store/xyn9vkh191bfv73g2306r866v26xw53p-NetworkManager-l2tp-gnome-1.2.8/libexec 
patching script interpreter paths in /nix/store/xyn9vkh191bfv73g2306r866v26xw53p-NetworkManager-l2tp-gnome-1.2.8
checking for references to /tmp/nix-build-NetworkManager-l2tp-gnome-1.2.8.drv-0 in /nix/store/xyn9vkh191bfv73g2306r866v26xw53p-NetworkManager-l2tp-gnome-1.2.8...
/nix/store/xyn9vkh191bfv73g2306r866v26xw53p-NetworkManager-l2tp-gnome-1.2.8

@garbas garbas merged commit 8a37ca7 into NixOS:master Dec 11, 2017
GrahamcOfBorg
GrahamcOfBorg reviewed Dec 11, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

(use '--show-trace' to show detailed location information)

@c0bw3b c0bw3b deleted the pkg/nm-l2tp branch September 28, 2018 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GrahamcOfBorg GrahamcOfBorg GrahamcOfBorg approved these changes

Assignees
No one assigned
Labels
8.has: package (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@c0bw3b @abbradar @teto @disassembler @nixborg @obadz @garbas @grahamc @GrahamcOfBorg