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

GNOME 46 fixes #306469

Merged
merged 2 commits into from
Apr 24, 2024
Merged

GNOME 46 fixes #306469

merged 2 commits into from
Apr 24, 2024

Conversation

jtojnar
Copy link
Member

@jtojnar jtojnar commented Apr 24, 2024

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.

gobject-instrospection before version 1.80 shipped typelibs for GLib.
As a result, programs relying on libgirepository such as those using pygobject3
would find the GLib typelibs without being wrapped at all.

In GNOME 46, the GLib typelibs were moved to glib package. So if we want
a program to find them, they need to be explicitly passed through `GI_TYPELIB_PATH`
environment variable.

This can be demonstrated by running `GI_TYPELIB_PATH= powerprofilesctl`:

    ImportError: cannot import name Gio, introspection typelib not found

Let’s add the library to path using a wrapper.
@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Apr 24, 2024
@jtojnar jtojnar requested a review from amaxine April 24, 2024 07:26
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Apr 24, 2024
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.

Looks good, thanks for catching that ppd needs wrapping now.

rev = "v${version}";
sha256 = "sha256-MpoeLXGdLfas/E3x5ojJW5Dd3H8XZORtFaBHgRGJXxg=";
src = fetchurl {
url = "https://www.imagination-land.org/files/gpaste/GPaste-${finalAttrs.version}.tar.xz";
Copy link
Contributor

Choose a reason for hiding this comment

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

This really does look dodgy, thanks for the comment confirming you verified the contents.

Copy link
Member Author

Choose a reason for hiding this comment

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

It always promoted tarballs hosted on the author’s website. We just ignored them.

There is an issue requesting for the tag: Keruspe/GPaste#443

pkgs/desktops/gnome/misc/gpaste/default.nix Outdated Show resolved Hide resolved
GNOME 46 support!
https://www.imagination-land.org/posts/2024-03-21-gpaste-45.1-released.html

No tag yet.
Checked that v45 tarball matches the git repo and that 45.1 diff is okay.

Also clean up the expression and fix license.
@amaxine amaxine merged commit 0f59a44 into NixOS:staging-next Apr 24, 2024
9 of 11 checks passed
@ofborg ofborg bot requested a review from amaxine April 24, 2024 10:39
@jtojnar jtojnar deleted the gnome-fixes branch April 24, 2024 11:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants