Skip to content

Comments

puddletag: fix for pyparsing 3.1.2#300887

Merged
wegank merged 1 commit intoNixOS:masterfrom
peterhoeg:f/puddletag_pyparsing
Apr 5, 2024
Merged

puddletag: fix for pyparsing 3.1.2#300887
wegank merged 1 commit intoNixOS:masterfrom
peterhoeg:f/puddletag_pyparsing

Conversation

@peterhoeg
Copy link
Member

Description of changes

Make it work with pyparsing 3.1.2 ref puddletag/puddletag#884

Also:

  1. do not double-wrap
  2. prep for qt6
  3. remove outdated comments

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.

@peterhoeg peterhoeg requested a review from dschrempf April 2, 2024 07:44
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Apr 2, 2024
Comment on lines +42 to +45
buildInputs = [
qtbase
qtwayland
];
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we need these now? I think we should have always included qtbase, but qtwayland?

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Apr 2, 2024
@peterhoeg
Copy link
Member Author

peterhoeg commented Apr 2, 2024 via email

@dschrempf
Copy link
Contributor

For reference, I found:

The Nixpkgs manual (first link) actually says we should only activate qtwayland on Linux-based systems... but I just checked the Nixpkgs repository and many times, it is just included as is.

@wegank
Copy link
Member

wegank commented Apr 3, 2024

The Nixpkgs manual (first link) actually says we should only activate qtwayland on Linux-based systems...

Definitely, but it's OK for this package, where meta.platforms is set to lib.platforms.linux.

@peterhoeg
Copy link
Member Author

Any remaining concerns @dschrempf ?

@dschrempf
Copy link
Contributor

No! I just tried it out, and it works here. I advice merging this soon; see #301857.

@wegank wegank merged commit 0b7ea8d into NixOS:master Apr 5, 2024
@peterhoeg peterhoeg deleted the f/puddletag_pyparsing branch April 24, 2024 07:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants