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

gnome3.gvfs: fix eval with allowAliases = false #67935

Merged
merged 5 commits into from
Sep 3, 2019
Merged

gnome3.gvfs: fix eval with allowAliases = false #67935

merged 5 commits into from
Sep 3, 2019

Conversation

jtojnar
Copy link
Member

@jtojnar jtojnar commented Sep 2, 2019

And other various no-op fixes.

@ofborg ofborg bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Sep 2, 2019
@jtojnar jtojnar requested a review from worldofpeace September 2, 2019 12:01
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Sep 2, 2019
@ofborg ofborg bot requested review from hedning and worldofpeace September 3, 2019 01:35
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Sep 3, 2019
@jtojnar
gnome2.gvfs: drop
8605b47 
Not needed by anything and dropping it will allow us to clean up the expression.

Changed to an alias as that is what it was in the first place.
@jtojnar
gvfs: only support GNOME 3, not GNOME 2
ef19440 
It will make the expression and calls nicer.
@jtojnar
gvfs: format with nixpkgs-fmt
f5a54f3
@jtojnar
gnome3.gvfs: fix eval with allowAliases = false
6fabbe5
@jtojnar
gnome3.glib-networking: replace with alias
fa03881 
Since we moved gsettings-desktop-schemas to top-level, gnome3.glib-networking was the same as glib-networking.
We could try to make the top-level variant not depend on gsettings-desktop-schemas again but that is probably
pointless, as the dependency is rather small compared to things like libproxy. Instead, we will just drop
the package in gnome3 attr set and always rely on the top-level expression.
worldofpeace
worldofpeace approved these changes Sep 3, 2019
View reviewed changes
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.

LGTM

@worldofpeace worldofpeace merged commit 0c52651 into NixOS:master Sep 3, 2019
@jtojnar jtojnar deleted the gnome-fixes branch September 3, 2019 02:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

@hedning hedning Awaiting requested review from hedning

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: clean-up 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jtojnar @worldofpeace