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

networkmanagerapplet: default to withGnome #75583

Merged
merged 1 commit into from Dec 21, 2019

Conversation

@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Dec 12, 2019

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 @

@andir
Copy link
Member

@andir andir commented Dec 13, 2019

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

@worldofpeace
Copy link
Member Author

@worldofpeace worldofpeace commented Dec 13, 2019

@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 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
Member Author

@worldofpeace worldofpeace commented Dec 13, 2019

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 worldofpeace force-pushed the worldofpeace:nm-applet-default-gnome branch from a7b5a2c to 1eafee5 Dec 13, 2019
This requires us to add gcr to the module.
@worldofpeace worldofpeace force-pushed the worldofpeace:nm-applet-default-gnome branch from 1eafee5 to f5081ec Dec 13, 2019
@worldofpeace worldofpeace requested a review from jtojnar Dec 13, 2019
@ofborg ofborg bot added the 6.topic: pantheon label Dec 13, 2019
@jtojnar
Copy link
Contributor

@jtojnar 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
16 checks passed
16 checks passed
networkmanagerapplet on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
networkmanagerapplet on aarch64-linux Success
Details
networkmanagerapplet on x86_64-linux Success
Details
@worldofpeace
Copy link
Member Author

@worldofpeace worldofpeace commented Dec 21, 2019

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

@worldofpeace worldofpeace deleted the worldofpeace:nm-applet-default-gnome branch Dec 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.