Skip to content

Gnome updates staging#80594

Merged
worldofpeace merged 12 commits intoNixOS:stagingfrom
worldofpeace:gnome-3.34.4-staging
Feb 23, 2020
Merged

Gnome updates staging#80594
worldofpeace merged 12 commits intoNixOS:stagingfrom
worldofpeace:gnome-3.34.4-staging

Conversation

@worldofpeace
Copy link
Contributor

@worldofpeace worldofpeace commented Feb 20, 2020 •
edited
Loading

Motivation for this change

Usual, we should probably merge master into staging because of the other updates. I did that.

Changes https://gist.github.com/worldofpeace/d8a8148b0d4f770678851fc66528ef28

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"
  • 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.

@ofborg ofborg bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Feb 20, 2020
@ofborg ofborg bot requested review from 7c6f434c, astsmtl, lovek323 and vcunat February 20, 2020 02:31
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Feb 20, 2020
This was referenced Feb 20, 2020
Closed
Closed
@hedning hedning mentioned this pull request Feb 21, 2020
Closed
@jtojnar
Copy link
Member

jtojnar commented Feb 22, 2020

VTE changes https://gitlab.gnome.org/GNOME/vte/compare/0.58.2...0.58.3

jtojnar
jtojnar approved these changes Feb 22, 2020
View reviewed changes
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

Changes look okay.

@hedning
Copy link
Contributor

hedning commented Feb 22, 2020

We need to drop libpeas pkgconfig patch as it's now upstream: https://gitlab.gnome.org/GNOME/libpeas/commit/dce9ad9576d87cb1244f76e14571b73d09a6a3d8

@worldofpeace
Copy link
Contributor Author

worldofpeace commented Feb 22, 2020

We need to drop libpeas pkgconfig patch as it's now upstream: https://gitlab.gnome.org/GNOME/libpeas/commit/dce9ad9576d87cb1244f76e14571b73d09a6a3d8

Thanks, I haven't yet checked if things built 👍 Will do that.

@ofborg ofborg bot requested a review from jtojnar February 22, 2020 22:27
@worldofpeace
Copy link
Contributor Author

worldofpeace commented Feb 22, 2020

Need to fix glib's split-dev-programs.patch. It would be nice if we didn't need this patch someday.

@worldofpeace
Copy link
Contributor Author

worldofpeace commented Feb 22, 2020

Need to fix glib's split-dev-programs.patch. It would be nice if we didn't need this patch someday.

Did that. Please review that patch. I've built a selection of packages at the top.

@GrahamcOfBorg build gtk3 glib

(^ cuz darwin)

hedning
hedning reviewed Feb 23, 2020
View reviewed changes
pkgs/development/libraries/glib/split-dev-programs.patch
'bindir=' + join_paths('${prefix}', get_option('bindir')),
+ 'devbindir=' + get_option('devbindir'),
'giomoduledir=' + giomodulesdir,
'giomoduledir=' + pkgconfig_giomodulesdir,
Copy link
Contributor

@hedning hedning Feb 23, 2020

Choose a reason for hiding this comment

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

The change here from upstream was doing a join_paths('${prefix}... on the gio_module_dir option, which we don't use 0. They renamed the variable at the same time. Updated patch should be fine 👍

Copy link
Contributor Author

@worldofpeace worldofpeace Feb 23, 2020

Choose a reason for hiding this comment

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

Thanks for checking, I come across the same to be sure 💟

@worldofpeace
Copy link
Contributor Author

worldofpeace commented Feb 23, 2020

Wahh, darwin timed out.

@worldofpeace worldofpeace merged commit 83b7dc4 into NixOS:staging Feb 23, 2020
@worldofpeace worldofpeace deleted the gnome-3.34.4-staging branch February 23, 2020 04:51
@jtojnar
Copy link
Member

jtojnar commented Mar 3, 2020

Looks like fede9f6 broke folks.

jtojnar added a commit to jtojnar/nixpkgs that referenced this pull request Mar 3, 2020
@jtojnar
folks: Fix build
54d984f 
This was missed in NixOS#80594.

Also re-enable tests.
@worldofpeace
Copy link
Contributor Author

worldofpeace commented Mar 3, 2020

Thanks @jtojnar

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@astsmtl astsmtl Awaiting requested review from astsmtl

@vcunat vcunat Awaiting requested review from vcunat

@lovek323 lovek323 Awaiting requested review from lovek323

@jtojnar jtojnar Awaiting requested review from jtojnar

1 more reviewer

@hedning hedning hedning left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

No open projects
Staging
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@worldofpeace @jtojnar @hedning