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

gjs: 1.64.2 -> 1.64.3 #89955

Merged
merged 3 commits into from Jun 11, 2020
Merged

gjs: 1.64.2 -> 1.64.3 #89955

merged 3 commits into from Jun 11, 2020

Conversation

r-ryantm
Copy link
Contributor

@r-ryantm r-ryantm commented Jun 9, 2020

Semi-automatic update generated by nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gjs/versions.

meta.description for gjs is: "JavaScript bindings for GNOME"

meta.homepage for gjs is: "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md"

meta.changelog for gjs is: ""

Updates performed
  • Version update
To inspect upstream changes
Impact
Checks done (click to expand)
  • built on NixOS
  • gjs result is not automatically checked, because some tests take a long time to run

Rebuild report (if merged into master) (click to expand)
130 total rebuild path(s)

44 package rebuild(s)

44 x86_64-linux rebuild(s)
43 i686-linux rebuild(s)
1 x86_64-darwin rebuild(s)
42 aarch64-linux rebuild(s)


First fifty rebuilds by attrpath
adapta-gtk-theme
chrome-gnome-shell
discover
flatpak
flatpak-builder
gjs
gnome-builder
gnome3.anjuta
gnome3.gjs
gnome3.gnome-books
gnome3.gnome-characters
gnome3.gnome-control-center
gnome3.gnome-documents
gnome3.gnome-maps
gnome3.gnome-session
gnome3.gnome-shell
gnome3.gnome-software
gnome3.gnome-sound-recorder
gnome3.gnome-terminal
gnome3.gnome-tweak-tool
gnome3.gnome-tweaks
gnome3.gnome-weather
gnome3.gnome_control_center
gnome3.gnome_session
gnome3.gnome_shell
gnome3.gnome_terminal
gnome3.gpaste
gnome3.polari
gnome3.pomodoro
gnome3.sushi
gnomeExtensions.drop-down-terminal
gnomeExtensions.gsconnect
gtkpod
haskellPackages.gi-ostree
malcontent-ui
minishift
ostree
pantheon.appcenter
pantheon.elementary-session-settings
pantheon.sideload
plasma5.discover
rpm-ostree
xdg-desktop-portal
xdg-desktop-portal-gtk
Instructions to test this update (click to expand)

Either download from Cachix:

nix-store -r /nix/store/k04226b2sihszn27zdqca0jmhf3d1rp2-gjs-1.64.3 \
  --option binary-caches 'https://cache.nixos.org/ https://r-ryantm.cachix.org/' \
  --option trusted-public-keys '
  r-ryantm.cachix.org-1:gkUbLkouDAyvBdpBX0JOdIiD2/DP1ldF3Z3Y6Gqcc4c=
  cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
  '

(r-ryantm's Cachix cache is only trusted for this store-path realization.)
For the Cachix download to work, your user must be in the trusted-users list or you can use sudo since root is effectively trusted.

Or, build yourself:

nix-build -A gjs https://github.com/r-ryantm/nixpkgs/archive/2df0fef39ea5278d6fcd8ec0d09e6f51c9f1666c.tar.gz

After you've downloaded or built it, look at the files and if there are any, run the binaries:

ls -la /nix/store/k04226b2sihszn27zdqca0jmhf3d1rp2-gjs-1.64.3
ls -la /nix/store/k04226b2sihszn27zdqca0jmhf3d1rp2-gjs-1.64.3/bin


Pre-merge build results

We have automatically built all packages that will get rebuilt due to
this change.

This gives evidence on whether the upgrade will break dependent packages.
Note sometimes packages show up as failed to build independent of the
change, simply because they are already broken on the target branch.

Result of nixpkgs-review 1

4 packages marked as broken and skipped:
- gnomeExtensions.icon-hider
- gnomeExtensions.system-monitor
- osxfuse
- osxsnarf
2 packages failed to build:
- pantheon.appcenter
- rpm-ostree
34 packages built:
- adapta-gtk-theme
- chrome-gnome-shell
- discover
- flatpak
- flatpak-builder
- gjs
- gnome-builder
- gnome3.anjuta
- gnome3.gnome-books
- gnome3.gnome-characters
- gnome3.gnome-control-center
- gnome3.gnome-documents
- gnome3.gnome-maps
- gnome3.gnome-session
- gnome3.gnome-shell
- gnome3.gnome-software
- gnome3.gnome-sound-recorder
- gnome3.gnome-terminal
- gnome3.gnome-tweak-tool
- gnome3.gnome-weather
- gnome3.gpaste
- gnome3.polari
- gnome3.pomodoro
- gnome3.sushi
- gnomeExtensions.drop-down-terminal
- gnomeExtensions.gsconnect
- gtkpod
- malcontent-ui
- minishift
- ostree
- pantheon.elementary-session-settings
- pantheon.sideload
- xdg-desktop-portal
- xdg-desktop-portal-gtk

Maintainer pings

cc @hedning @jtojnar @worldofpeace for testing.

Copy link
Contributor

@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.

Copy link
Contributor

@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.

Installed tests fail.

@hedning
Copy link
Contributor

hedning commented Jun 10, 2020

Yeah, unfortunately the installedTests have been broken for a while: https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.installed-tests.gjs.x86_64-linux

IIRC the environment require something extra for the Gio override test. Think we looked at it when doing 3.36 without finding a solution?

@jtojnar
Copy link
Contributor

jtojnar commented Jun 10, 2020

I only recall looking into the package tests, not installed tests. Maybe I forgot about them.

Looking at the source code, I would guess this is the offending line (why no stack trace 🙀):

https://gitlab.gnome.org/GNOME/gjs/-/blob/b4fb680928301d9bb23089508d0f1fd7b65d7571/modules/core/overrides/Gio.js#L553

source is defined in https://gitlab.gnome.org/GNOME/gjs/-/blob/b4fb680928301d9bb23089508d0f1fd7b65d7571/modules/core/overrides/Gio.js#L550

And Gio.SettingsSchemaSource.get_default can be null when there are no schemas installed https://lazka.github.io/pgi-docs/Gio-2.0/structs/SettingsSchemaSource.html#Gio.SettingsSchemaSource.get_default

Maybe something like the following would work:

--- a/pkgs/development/libraries/gjs/default.nix
+++ b/pkgs/development/libraries/gjs/default.nix
@@ -96,6 +96,7 @@ in stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \
+      --prefix XDG_DATA_DIRS : "${glib.getSchemaPath gtk3.out}/../.." \
       --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}"
   '';
 

Installed tests require GSettings schemas.

And the build-time tests are now passing.
@jtojnar
Copy link
Contributor

jtojnar commented Jun 10, 2020

It seems like meson tests now succeed.

I also see the following warning, which warrant investigation since we have C.UTF-8:

meson.build:660: WARNING: Your libc does not have the C.UTF-8 locale and no other
suitable UTF-8 fallback locale could be found. You can still build GJS, but
some tests will fail.

The patch fixes installed tests too.

@ofborg ofborg bot requested a review from jtojnar June 10, 2020 21:04
The build was complaining:

	meson.build:660: WARNING: Your libc does not have the C.UTF-8 locale and no other
	suitable UTF-8 fallback locale could be found. You can still build GJS, but
	some tests will fail.

The tests do not actually seem to be affected but still.
@ofborg ofborg bot requested a review from jtojnar June 10, 2020 21:24
@r-ryantm r-ryantm closed this Jun 11, 2020
@r-ryantm r-ryantm deleted the auto-update/gjs branch June 11, 2020 04:54
@jtojnar
Copy link
Contributor

jtojnar commented Jun 11, 2020

This was still awaiting review.

@ryantm ryantm restored the auto-update/gjs branch June 11, 2020 05:23
@ryantm ryantm reopened this Jun 11, 2020
@ryantm
Copy link
Member

ryantm commented Jun 11, 2020

There was an accidental mass closing of bot prs sorry.

@jtojnar
Copy link
Contributor

jtojnar commented Jun 11, 2020

@GrahamcOfBorg build gjs
@GrahamcOfBorg test installedTests.gjs

@jtojnar jtojnar merged commit ee540d4 into NixOS:master Jun 11, 2020
@r-ryantm r-ryantm deleted the auto-update/gjs branch June 14, 2020 03:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants