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

networkmanager: 1.16.0 -> 1.18.0 #60060

Merged
merged 2 commits into from Apr 26, 2019

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Apr 22, 2019

Motivation for this change
  • build w/iwd support since it's free (no dep required!)
  • move to iputils for minor utilities, instead of inetutils
  • libnm-glib has been deprecated for 5 years, don't build support for it
    • This is the last release offering this as an option
  • parallel building :)

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/raw/1.18.0/NEWS

Things done

(following is marked based on my testing with a similar branch,
but not exactly current 'staging'. FWIW.)

  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

FWIW been using this on my system since packaging it yesterday morning.

@worldofpeace
Copy link
Contributor

@dtzWill This will conflict with #59916

@worldofpeace
Copy link
Contributor

Also we need to keep libnm-glib. See #59916 (comment)

@dtzWill
Copy link
Member Author

dtzWill commented Apr 22, 2019

Technically conflicts, but I think it'll be more or less the same before or after. But might be best to be sure to handle the conflict in the same branch and not burden someone merging staging to master or something :).

@dtzWill
Copy link
Member Author

dtzWill commented Apr 22, 2019

Unless there's a strong reason to go the other way 'round (LMK!), I'm happy with (and suggest) we tackle the meson conversion first. One thing at a time! :)

@dtzWill
Copy link
Member Author

dtzWill commented Apr 22, 2019

(or include this in the conversion? Whatever y'all feel is best ^_^)

@worldofpeace
Copy link
Contributor

Enjoyed reading your comments as they came in because we were thinking all the same things 🤣

Not sure how to go about things, probably path of least resistance 👍

@teto
Copy link
Member

teto commented Apr 23, 2019

From the changelog Add support for policy routing rules. yeah sounds cool !

* build w/iwd support since it's free (no dep required!)
* move to iputils for minor utilities, instead of inetutils
* parallel building :)

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/raw/1.18.0/NEWS
@dtzWill
Copy link
Member Author

dtzWill commented Apr 23, 2019 via email

@dtzWill
Copy link
Member Author

dtzWill commented Apr 23, 2019 via email

@kalbasit
Copy link
Member

Yes and no :). I did not set out to remove this, and I'm not sure I'm aware it was removed. Even so, it wasn't quite "accidental" in that AFAICT it was simply determined not useful when I generated the patch :). Perhaps different settings were used previously, but it applies so I'm inclined to think it's alright. The next line is still the same, however, so I think if you'd prefer we can touchup the patch to keep it.

@cstrahan pointed out that it was actually removed from the patch file itself as opposed to what gets patched by it. My bad not noticing that it can stay like this no problem.

@dtzWill dtzWill requested review from jtojnar and hedning April 26, 2019 03:58
Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Looks good otherwise.

pkgs/tools/networking/network-manager/default.nix Outdated Show resolved Hide resolved
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

Looks good with jtojnar's suggestion

Per reviewer feedback, thanks!

Co-Authored-By: dtzWill <github@wdtz.org>
@dtzWill dtzWill merged commit 1cf626c into NixOS:staging Apr 26, 2019
@dtzWill dtzWill deleted the update/networkmanager-1.18 branch April 26, 2019 20:05
@dtzWill
Copy link
Member Author

dtzWill commented Apr 26, 2019

Thanks, all! \o/

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.

None yet

6 participants