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.

Sign up for GitHub

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

Jump to bottom

python3Packages.sip: fix typo #282473

Closed
wants to merge 2 commits into from
Closed

python3Packages.sip: fix typo #282473

wants to merge 2 commits into from

Conversation

zeuner
Copy link
Contributor

@zeuner zeuner commented Jan 21, 2024

Description of changes

A typo broke the build of reverse dependencies. This PR fixes it. See also macports/macports-ports@ec06943

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 requested a review from nrdxp January 21, 2024 04:20
@dotlambda
Copy link
Member

Should go to staging.

A typo broke the build of reverse dependencies.

Do you have an example?

@zeuner
Copy link
Contributor Author

zeuner commented Jan 21, 2024

Do you have an example?

I encountered it when trying to build pythonPackages.poppler-qt5.

@zeuner zeuner marked this pull request as draft January 21, 2024 08:30
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: qt/kde 6.topic: kernel The Linux kernel 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: rust 6.topic: golang 6.topic: ruby 6.topic: vim 6.topic: stdenv Standard environment 6.topic: nodejs 6.topic: systemd labels Jan 21, 2024
@zeuner zeuner changed the base branch from master to staging January 21, 2024 08:35
@github-actions github-actions bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: qt/kde 6.topic: kernel The Linux kernel 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 21, 2024
@zeuner
Copy link
Contributor Author

zeuner commented Jan 21, 2024

I rebased it to an older staging commit since the latest staging contains libplacebo_5 and vulkan-volk which do not honour the pkgs/by-name policy.

@infinisil infinisil mentioned this pull request Jan 21, 2024
Merged
1 task
@infinisil
Copy link
Member

See #282707 for why CI failed, it's an interesting edge case, could've been fixed by retriggered CI

nrdxp
nrdxp approved these changes Jan 21, 2024
View reviewed changes
Copy link

@nrdxp nrdxp left a comment

Choose a reason for hiding this comment

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

I checked upstream and the tip has already been fixed so this should be fine until we update past the upstream fix.

@delroth delroth added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Jan 21, 2024
@dotlambda
Copy link
Member

@ofborg build python3.pkgs.sip

@dotlambda
Copy link
Member

Actually should we merge it into staging-next since it fixes some builds?

@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 21, 2024
@ofborg ofborg bot requested a review from nrdxp January 22, 2024 00:00
@Stunkymonkey
Copy link
Contributor

We should continue in #281180 which provides the newer version fixing this issue. Looking at the 6.8.1 code: https://www.riverbankcomputing.com/hg/sip/file/d6da922b80f7/sipbuild/generator/outputs/code.py

@zeuner
Copy link
Contributor Author

zeuner commented Jan 23, 2024

We should continue in #281180 which provides the newer version fixing this issue. Looking at the 6.8.1 code: https://www.riverbankcomputing.com/hg/sip/file/d6da922b80f7/sipbuild/generator/outputs/code.py

Should 219c17d also go there?

@Stunkymonkey
Copy link
Contributor

I not a big fan of df7ab7d.

219c17d LGTM, but not sure where we should track it.

@dotlambda dotlambda mentioned this pull request Jan 24, 2024
Merged
13 tasks
@natsukium
Copy link
Member

closing in favor of #281180

@natsukium natsukium closed this Jan 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nrdxp nrdxp Awaiting requested review from nrdxp

Assignees
No one assigned
Labels
6.topic: python 8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@zeuner @dotlambda @infinisil @Stunkymonkey @natsukium @nrdxp @delroth