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.gnome-shell: clean up #93045

Merged
merged 4 commits into from Jul 18, 2020
Merged

gnome3.gnome-shell: clean up #93045

merged 4 commits into from Jul 18, 2020

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Jul 13, 2020 •
edited

Motivation for this change

Various clean ups, not yet tested.

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 nixpkgs-review --run "nixpkgs-review wip"
  • Ran GNOME in VM without seeing any issues.
  • 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.

@jtojnar
gnome3.gnome-shell: Format with nixpkgs-fmt
8cddeef 
Also reorder and stop using aliases for pkg-config and docbook-xsl-{,no}ns.
@jtojnar
gnome3.gnome-shell: Clean up
0937ea6 
Remove the following dependencies:

* libcanberra – https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/327
* libsoup – https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/234
* libXtst – https://gitlab.gnome.org/GNOME/gnome-shell/commit/9f5a2d8aca5ae91be4cad12e6a3d02e1ac26e39a
* glibcLocales – no longer necessary since glibc now contains C.UTF-8 locale
* docbook-xsl-ns – not sure why this was included but there are no complaints when this is removed

Also move gnome-autoar & json-glib to proper section and drop unused clutter arg.
@jtojnar
gnome3.gnome-shell: build docs
b491020
@jtojnar
gnome3.mutter: clean up
4a48684 
* upower no longer used – https://gitlab.gnome.org/GNOME/mutter/commit/fa9e330f2c6d3ec34ff57b2c67a9c75c09401014
* only libcanbera, not libcanberra-gtk is used
* cogl has been in-tree for ages
* geocode-glib has not been used ever?
* no need to have zenity in buildInputs, it is only needed in patch
* move patches attr after src
@ofborg ofborg bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Jul 13, 2020
@ofborg ofborg bot requested review from worldofpeace and hedning July 13, 2020 08:47
dasj19
dasj19 approved these changes Jul 13, 2020
View reviewed changes
Copy link
Contributor

@dasj19 dasj19 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested with nix-shell -p nixpkgs-review --run "nixpkgs-review pr 93045"

Results:
13 packages built:
adapta-gtk-theme chrome-gnome-shell gnome3.gnome-control-center gnome3.gnome-session gnome3.gnome-shell gnome3.gnome-terminal gnome3.gnome-tweaks gnome3.gpaste gnome3.mutter gnome3.pomodoro gnomeExtensions.gsconnect gnomeExtensions.system-monitor pantheon.elementary-session-settings

pkgs/desktops/gnome-3/core/gnome-shell/default.nix
, gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3
, sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon
, gnome-autoar, asciidoc-full
{ fetchurl
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it best practices to have one dependency per line?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I (and few other people) prefer that in packages that we maintain since it results in slightly cleaner diffs and makes git blame easier in the future.

Copy link
Contributor

@dasj19 dasj19 Jul 13, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay, I see... but it would be nice to have consensus over the way we write things, that's where a best practices guide would come along, and linters could be built on top of it...

@jtojnar
Copy link
Contributor Author

jtojnar commented Jul 13, 2020

Successfully tested this in a VM.

@jtojnar jtojnar merged commit 82c91e1 into NixOS:master Jul 18, 2020
@jtojnar jtojnar deleted the gnome-shell-cleanup branch July 18, 2020 04:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dasj19 dasj19 dasj19 approved these changes

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

@hedning hedning Awaiting requested review from hedning

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 10.rebuild-linux: 11-100 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jtojnar @dasj19