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: Expand dns description, integrate with other services #41898

Merged
merged 1 commit into from Jun 29, 2018
Merged

networkmanager: Expand dns description, integrate with other services #41898

merged 1 commit into from Jun 29, 2018

Conversation

benley
Copy link
Member

@benley benley commented Jun 12, 2018 •
edited

Rather than special-casing the dns options in networkmanager.nix, use the module system to let unbound and systemd-resolved contribute to the networkmanager config.

Things done
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@benley
networkmanager: Expand dns description, integrate with other services
da95fb4 
Rather than special-casing the dns options in networkmanager.nix, use
the module system to let unbound and systemd-resolved contribute to
the newtorkmanager config.
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: networkmanager

Partial log (click to expand)

/nix/store/p0bi0km1arhd3wk7g35dqh1lmg8g2paa-network-manager-1.10.6

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: networkmanager

Partial log (click to expand)

copying path '/nix/store/s7w2fzsg8di2pzznvd95lcd49r4kldgl-slang-2.3.2' from 'https://cache.nixos.org'...
copying path '/nix/store/7hbnqcjhhza6bn5c6j37f97fa8j74chn-stoken-0.90' from 'https://cache.nixos.org'...
copying path '/nix/store/xybzhrks5s8ja70jkyhrkpw0smyql09v-vpnc-0.5.3-post-r550' from 'https://cache.nixos.org'...
copying path '/nix/store/0c6y46pn9k7rqn0nwgsiljngkmnsgyd6-openconnect-7.08' from 'https://cache.nixos.org'...
copying path '/nix/store/qf5l6rn1ki3pdvl739z01mhavda4y841-libqmi-1.20.0' from 'https://cache.nixos.org'...
copying path '/nix/store/mbb23a15bka2m7yz53g7g1kw0f3z329j-newt-0.52.20' from 'https://cache.nixos.org'...
copying path '/nix/store/mfh60gcc2mnzan4xc609wl5nbsvly0gf-bluez-5.49' from 'https://cache.nixos.org'...
copying path '/nix/store/zhl3zgjf1q02qzfnirh73np82ywaaaj4-modem-manager-1.7.990' from 'https://cache.nixos.org'...
copying path '/nix/store/0gd87shamw0v8m961jjb1fk4hnfcik8q-network-manager-1.10.6' from 'https://cache.nixos.org'...
/nix/store/0gd87shamw0v8m961jjb1fk4hnfcik8q-network-manager-1.10.6

@benley benley merged commit dca7e24 into NixOS:master Jun 29, 2018
@benley benley deleted the benley/networkmanager-config branch June 29, 2018 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@benley @GrahamcOfBorg