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

python2Packages.pyqt4: Fix build #56717

Merged
merged 2 commits into from
Mar 3, 2019
Merged

python2Packages.pyqt4: Fix build #56717

merged 2 commits into from
Mar 3, 2019

Conversation

jtojnar
Copy link
Member

@jtojnar jtojnar commented Mar 2, 2019

Motivation for this change

Fixes: #56712

cc @hedning

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.

@jtojnar jtojnar requested a review from FRidh as a code owner March 2, 2019 17:08
@jtojnar jtojnar changed the title Pyqt4 python2Packages.pyqt4: Fix build Mar 2, 2019
@jtojnar jtojnar force-pushed the pyqt4 branch 2 times, most recently from 46c8993 to 1e436e0 Compare March 2, 2019 17:18
hedning
hedning approved these changes Mar 2, 2019
View reviewed changes
Copy link
Contributor

@hedning hedning left a comment

Choose a reason for hiding this comment

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

Looks good to me at least.

@hedning hedning added 9.needs: port to stable A PR needs a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Mar 2, 2019
@hedning
Copy link
Contributor

hedning commented Mar 2, 2019

The python strictDeps change didn't hit 19.03, so not sure if it's necessary to backport.

@FRidh
Copy link
Member

FRidh commented Mar 2, 2019

@hedning I backported the whole of staging-next, so including strictDeps. Yes, this needs to be backported.

@FRidh
Copy link
Member

FRidh commented Mar 2, 2019

@GrahamcOfBorg python2Packages.pyqt4 python3Packages.pyqt4

@hedning hedning added the 9.needs: port to stable A PR needs a backport to the stable release. label Mar 2, 2019
@FRidh FRidh mentioned this pull request Mar 3, 2019
Closed
10 tasks
@FRidh
Copy link
Member

FRidh commented Mar 3, 2019

You're fast. I was just cherry-picking them.... :)

@jtojnar jtojnar merged commit 27f1a16 into NixOS:master Mar 3, 2019
@jtojnar jtojnar deleted the pyqt4 branch March 3, 2019 20:19
@jtojnar
Copy link
Member Author

jtojnar commented Mar 3, 2019

Backported:

commit 5b38b4572a40af7d396cbd01e66d0d8fec3667b6
Author: Jan Tojnar <jtojnar@gmail.com>
Date:   Sat Mar 2 18:07:19 2019 +0100

    python2Packages.pyqt4: partial clean up
    
    (cherry picked from commit 6471655f76ea8c7c9289704e5a11dfcdd1b139e3)

commit 1861f58d9f7cc6486391bcc66439d1a0c47c7fe6
Author: Jan Tojnar <jtojnar@gmail.com>
Date:   Sat Mar 2 18:03:28 2019 +0100

    python2Packages.pyqt4: Fix build
    
    (cherry picked from commit f14a48f716a7fb29569bc9d6ad4aef8bb71180ae)

@samueldr samueldr removed the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hedning hedning hedning approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@svanderburg svanderburg Awaiting requested review from svanderburg

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Pulseeffects broken
5 participants
@jtojnar @hedning @FRidh @samueldr @GrahamcOfBorg