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

network-manager: 1.20.4 -> 1.20.6 #73598

Merged
merged 1 commit into from Nov 18, 2019

Conversation

lovesegfault
Copy link
Member

Motivation for this change

vbump

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @Phreedom @domenkozar @obadz

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.

Thanks, and we for sure need this because iwd will be broken in networkmanager without it #72321
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.20.6/NEWS#L9

@worldofpeace worldofpeace merged commit e6963bc into NixOS:staging Nov 18, 2019
@lovesegfault
Copy link
Member Author

@worldofpeace The bump came exactly because I saw someone bump iwd but not NM, and I use both :P

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 19, 2019

While reviewing something else on staging I got:

builder for '/nix/store/l438saam1469mjazfpv52awkk2fdvrpx-network-manager-1.20.6.drv' failed with exit code 1; last 10 log lines:
  patching file src/nm-core-utils.c
  applying patch /nix/store/s530j703x3rwc7c713f47khjch8d9wk4-fix-install-paths.patch
  patching file meson.build
  patching file src/settings/plugins/ifcfg-rh/meson.build
  applying patch /nix/store/x0kw3z3xa0ym89cmiz41x2mzr0s3inmk-4c11364201c094ad19ab9980ea6051a82bd2a550.patch
  patching file config.h.meson
  Reversed (or previously applied) patch detected!  Assume -R? [n] 
  Apply anyway? [n] 
  Skipping patch.
  1 out of 1 hunk ignored -- saving rejects to file config.h.meson.rej

Looking at upstream config.h.meson for 1.20.6 it seems the patch fetched from Gitlab to solve #72330 is not needed anymore.

@worldofpeace
Copy link
Contributor

worldofpeace commented Nov 19, 2019

@c0bw3b Will fix. My patch was merged upstream.

@worldofpeace
Copy link
Contributor

d6850a9

@lovesegfault lovesegfault deleted the networkmanager-1.20.6 branch April 7, 2020 07:32
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

3 participants