Skip to content

Comments

python3Packages.sip: fix typo#282473

Closed
zeuner wants to merge 2 commits intoNixOS:stagingfrom
zeuner:sip-typo
Closed

python3Packages.sip: fix typo#282473
zeuner wants to merge 2 commits intoNixOS:stagingfrom
zeuner:sip-typo

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.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jan 21, 2024
@ofborg ofborg bot requested a review from nrdxp January 21, 2024 04:20
@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: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Jan 21, 2024
@dotlambda
Copy link
Member

dotlambda commented Jan 21, 2024

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 Object-oriented framework for GUI creation 6.topic: kernel The Linux kernel 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: vim Advanced text editor 6.topic: stdenv Standard environment 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 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 Object-oriented framework for GUI creation 6.topic: kernel The Linux kernel 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 21, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 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.

@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. and removed 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 21, 2024
@infinisil infinisil mentioned this pull request Jan 21, 2024
Merged
1 task
@infinisil
Copy link
Member

infinisil commented Jan 21, 2024

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 person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Jan 21, 2024
@dotlambda
Copy link
Member

dotlambda commented Jan 21, 2024

@ofborg build python3.pkgs.sip

@dotlambda
Copy link
Member

dotlambda commented Jan 21, 2024

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 person. label Jan 21, 2024
@ofborg ofborg bot requested a review from nrdxp January 22, 2024 00:00
@Stunkymonkey
Copy link
Contributor

Stunkymonkey 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

@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

Stunkymonkey commented Jan 23, 2024

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

natsukium commented Jan 24, 2024

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 Python is a high-level, general-purpose programming language. 8.has: clean-up This PR removes packages or removes other cruft 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: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

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