Skip to content

pythonPackages.sip: do not build tools for non-default sip module#52968

Closed
orivej wants to merge 1 commit intoNixOS:masterfrom
orivej:sip-tools
Closed

pythonPackages.sip: do not build tools for non-default sip module#52968
orivej wants to merge 1 commit intoNixOS:masterfrom
orivej:sip-tools

Conversation

@orivej
Copy link
Contributor

@orivej orivej commented Dec 27, 2018

Motivation for this change

This ensures that the default sip and alternative sips do not have any files in common: #52956 (comment)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@orivej orivej requested a review from FRidh as a code owner December 27, 2018 14:48
@orivej orivej mentioned this pull request Dec 27, 2018
Merged
10 tasks
@GrahamcOfBorg GrahamcOfBorg added 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Dec 27, 2018
FRidh
FRidh reviewed Dec 27, 2018
View reviewed changes
pkgs/development/python-modules/sip/default.nix Outdated
Copy link
Member

@FRidh FRidh Dec 27, 2018

Choose a reason for hiding this comment

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

python.sitePackages

Copy link
Contributor Author

@orivej orivej Dec 27, 2018

Choose a reason for hiding this comment

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

fixed

@orivej
pythonPackages.sip: do not build tools for non-default sip module
9433436 
This ensures that the default sip and alternative sips do not have common files.
FRidh
FRidh reviewed Dec 29, 2018
View reviewed changes
pkgs/development/python-modules/pyqt/5.x.nix
outputs = [ "out" "dev" ];

nativeBuildInputs = [ pkgconfig qmake lndir ];
nativeBuildInputs = [ pkgconfig qmake lndir sip ];
Copy link
Member

@FRidh FRidh Dec 29, 2018

Choose a reason for hiding this comment

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

Should this be pyqt5-sip?

Copy link
Contributor Author

@orivej orivej Dec 31, 2018

Choose a reason for hiding this comment

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

No, it seems that the upstream envisions that there is one tool sip which generates multiple modules according to sip -n module_name parameter. This is why sip-the-tool is a native build input, and pyqt5-sip-module is a propagated build input.

After this PR sip ships both the tool and the module sip (as before), but pyqt5-sip ships only the module PyQt5.sip.

Copy link
Member

@FRidh FRidh Dec 31, 2018

Choose a reason for hiding this comment

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

Ok. Could you include the explanation as a comment?

@mmahut
Copy link
Member

mmahut commented Aug 13, 2019

Are there any updates on this pull request, please?

@FRidh
Copy link
Member

FRidh commented Aug 13, 2019

I should have seen this when working on the pyqt5 upgrade done in c3839de. I suppose that could be changed to use this approach if this is what upstream wants. IMO they should document this better though.

@stale
Copy link

stale bot commented Jun 1, 2020

Thank you for your contributions.
This has been automatically marked as stale because it has had no activity for 180 days.
If this is still important to you, we ask that you leave a comment below. Your comment can be as simple as "still important to me". This lets people see that at least one person still cares about this. Someone will have to do this at most twice a year if there is no other activity.
Here are suggestions that might help resolve this more quickly:

  1. Search for maintainers and people that previously touched the
    related code and @ mention them in a comment.
  2. Ask on the NixOS Discourse. 3. Ask on the #nixos channel on
    irc.freenode.net.

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 1, 2020
@ryantm ryantm added the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 3, 2020
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 3, 2020
@ryantm ryantm added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Oct 3, 2020
@doronbehar
Copy link
Contributor

doronbehar commented Oct 7, 2020

Would this change be relevant if sip will be upgraded? #99936

@FRidh FRidh mentioned this pull request Oct 8, 2020
Closed
10 tasks
@FRidh
Copy link
Member

FRidh commented Oct 8, 2020

rebased in #100050.

@FRidh FRidh closed this Oct 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@FRidh FRidh FRidh left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@orivej @mmahut @FRidh @doronbehar @ryantm @GrahamcOfBorg