Skip to content

gjs: 1.78.1 -> 1.78.3#279871

Merged
amaxine merged 1 commit intoNixOS:stagingfrom
trofi:gjs-update
Jan 19, 2024
Merged

gjs: 1.78.1 -> 1.78.3#279871
amaxine merged 1 commit intoNixOS:stagingfrom
trofi:gjs-update

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jan 9, 2024

Changes:

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Jan 10, 2024
@amaxine
Copy link
Contributor

amaxine commented Jan 10, 2024

@ofborg build gjs gjs.tests

@amaxine
Copy link
Contributor

amaxine commented Jan 12, 2024

Tests don't work, but it seems like tests also currently don't work on master. Would be nice to fix that.

@trofi
Copy link
Contributor Author

trofi commented Jan 12, 2024

Yeah, looks like Xorg fails to start for DRI initialization problems:

vm-test-run-gjs> machine # #9  0x00007f9843d6a884 u_pipe_screen_get_param_defaults (kms_swrast_dri.so + 0xc80884)
vm-test-run-gjs> machine # #10 0x00007f984319eb50 dri2_init_screen_extensions (kms_swrast_dri.so + 0xb4b50)
vm-test-run-gjs> machine # #11 0x00007f984319ef70 dri_swrast_kms_init_screen (kms_swrast_dri.so + 0xb4f70)

@trofi
Copy link
Contributor Author

trofi commented Jan 14, 2024

Bisected gjs test suite regression down to mesa update in be9351c mesa: 23.3.1 -> 23.3.2.

Reverting be9351c mesa: 23.3.1 -> 23.3.2 restores the test.

UPDATE: added the comment as #277570 (comment)

@trofi
Copy link
Contributor Author

trofi commented Jan 15, 2024

Vladimir suggested testing fresher staging that contains mesa-23.3.3 and that makes that error to go away.

One more fix is needed for gjs to pass. It's a pam regression. Proposed fix as #281182

@trofi
Copy link
Contributor Author

trofi commented Jan 17, 2024

All the test blockers should be fixed now. Rebased against current staging.

@amaxine
Copy link
Contributor

amaxine commented Jan 19, 2024

https://gitlab.gnome.org/GNOME/gjs/-/blob/1.78.3/NEWS fixes a major regression, assuming it doesn't break anything let's update before merging.

@trofi trofi changed the title gjs: 1.78.1 -> 1.78.2 gjs: 1.78.1 -> 1.78.3 Jan 19, 2024
@trofi
Copy link
Contributor Author

trofi commented Jan 19, 2024

Updated to 1.78.3

Copy link
Contributor

@amaxine amaxine left a comment

Choose a reason for hiding this comment

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

Thanks. gjs builds fine, I'll merge after my local build of tests finishes (been going for ~5 hours so far).

@amaxine
Copy link
Contributor

amaxine commented Jan 19, 2024

Just finished, all good!

@amaxine amaxine merged commit db5fbce into NixOS:staging Jan 19, 2024
@github-actions
Copy link
Contributor

Backport failed for staging-23.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin staging-23.11
git worktree add -d .worktree/backport-279871-to-staging-23.11 origin/staging-23.11
cd .worktree/backport-279871-to-staging-23.11
git switch --create backport-279871-to-staging-23.11
git cherry-pick -x 234a90427a2707de5b73b4a28be51a2f8d3e5740

@trofi trofi deleted the gjs-update branch January 19, 2024 22:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants