Skip to content

GNOME: 41.2 → 41.3#157350

Merged
jtojnar merged 18 commits intostaging-nextfrom
gnome
Jan 31, 2022
Merged

GNOME: 41.2 → 41.3#157350
jtojnar merged 18 commits intostaging-nextfrom
gnome

Conversation

@jtojnar
Copy link
Member

@jtojnar jtojnar commented Jan 30, 2022

Motivation for this change

Fixes: #156025
Fixes: #156026

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 30, 2022
@jtojnar
Copy link
Member Author

jtojnar commented Jan 30, 2022

@GrahamcOfBorg test gnome gnome-xorg

@jtojnar jtojnar requested a review from dasj19 January 30, 2022 03:42
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Jan 30, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Jan 30, 2022
@jtojnar
Copy link
Member Author

jtojnar commented Jan 30, 2022

Most of the rebuild are actually just python packages via mathplotlib depending on fonttools

@jtojnar jtojnar changed the title GNOME: update GNOME: 41.2 → 41.3 Jan 30, 2022
@sternenseemann

This comment has been minimized.

@sternenseemann
Copy link
Member

@ofborg build python3Packages.afdko

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.

As it is now this PR fails to build:

applying patch /nix/store/d9iqkfpahq8hci53n1hsr09hq0qwnq41-fix-paths.patch
patching file gnome-session/gnome-session.in
Hunk #1 FAILED at 3.
1 out of 1 hunk FAILED -- saving rejects to file gnome-session/gnome-session.in.rej
patching file gnome-session/main.c
error: builder for '/nix/store/xqrwrf8q36qr9jq30d4qysbw2l7l1534-gnome-session-41.3.drv' failed with exit code 1

I tested on x86_64 linux

@jtojnar
Copy link
Member Author

jtojnar commented Jan 30, 2022

Thanks, seems to work in VM now.

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.

Yes, now it builds.

And the changes look good.

@ofborg ofborg bot requested a review from dasj19 January 30, 2022 19:53
@jtojnar jtojnar changed the base branch from master to staging-next January 31, 2022 10:03
@jtojnar jtojnar merged commit 95ba61a into staging-next Jan 31, 2022
@jtojnar jtojnar deleted the gnome branch January 31, 2022 10:22
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Jan 31, 2022

Most python packages are missing import checks and they all have no maintainers. All packages need to have a maintainer. Going to add the gnome team to everything.

Alternatively you can also add yourself or we create a fonttools maintainer team.

#157516

@jtojnar
Copy link
Member Author

jtojnar commented Jan 31, 2022

Yeah, sorry about that. I used some other Python package as a template and forgot to check. I guess I will add myself since the packages do not really have much to do with GNOME other than to build Cantarell fonts. Unless @sternenseemann thinks creating a fonttools team would make sense.

@sternenseemann
Copy link
Member

Either would be fine by me, it'd be great if we could manage the concern somehow.

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 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants