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

Jump to bottom

networkmanagerapplet: default to withGnome #75583

Merged
merged 1 commit into from Dec 21, 2019
Merged

networkmanagerapplet: default to withGnome #75583

merged 1 commit into from Dec 21, 2019

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

This requires us to add gcr to the module.

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 @

@ofborg ofborg bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos 8.has: module (update) labels Dec 12, 2019
@ofborg ofborg bot requested a review from Phreedom December 12, 2019 23:57
@andir
Copy link
Member

andir commented Dec 13, 2019

Why do we want this? The motivation isn't really explicit about that.

@worldofpeace
Copy link
Contributor Author

@andir I discovered that all of the networkmanager plugins default to withGnome, and you can't even override them in the nixos module anymore. I don't really see much point to turn this off. We have gnome3. attrs for these things, but I think they should be there.

@jtojnar
Copy link
Contributor

jtojnar commented Dec 13, 2019

Use of aliases:

$ rg gnome3.+networkmanagerapplet
pkgs/desktops/pantheon/default.nix
159:    inherit (gnome3) networkmanagerapplet;
197:    inherit (gnome3) networkmanagerapplet;

pkgs/tools/networking/network-manager/strongswan.nix
13:  buildInputs = [ networkmanager strongswanNM libsecret gtk3 gnome3.networkmanagerapplet ];

pkgs/tools/networking/network-manager/vpnc/default.nix
27:    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];

pkgs/tools/networking/network-manager/fortisslvpn/default.nix
28:    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];

pkgs/tools/networking/network-manager/iodine/default.nix
28:    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];

pkgs/tools/networking/network-manager/openvpn/default.nix
28:    ++ stdenv.lib.optionals withGnome [ gtk3 libsecret gnome3.networkmanagerapplet ];

@worldofpeace
Copy link
Contributor Author

worldofpeace commented Dec 13, 2019 •
edited

I don't get why eval didn't fail, we do lib.optionalAttrs (config.allowAliases or true) which is the same for aliases.nix.

@worldofpeace
networkmanagerapplet: default to withGnome
f5081ec 
This requires us to add gcr to the module.
@ofborg ofborg bot added the 6.topic: pantheon The Pantheon desktop environment label Dec 13, 2019
@jtojnar
Copy link
Contributor

jtojnar commented Dec 13, 2019

After some experimentations with commenting out and renaming things and running nix-env -qa --json --file . --arg config '{ allowAliases = false; }', the only explanation is that attributes are accessed lazily, so their absence in the attrset is not noticed.

@worldofpeace worldofpeace merged commit e203d58 into NixOS:master Dec 21, 2019
@worldofpeace
Copy link
Contributor Author

@andir Lmk if you did have an issue with this.

@worldofpeace worldofpeace deleted the nm-applet-default-gnome branch December 21, 2019 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar approved these changes

@Phreedom Phreedom Awaiting requested review from Phreedom

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos 6.topic: pantheon The Pantheon desktop environment 8.has: module (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
3 participants
@worldofpeace @andir @jtojnar