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.

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

python-PyQt: 5.6 -> 5.8 #23485

Closed
wants to merge 2 commits into from
Closed

python-PyQt: 5.6 -> 5.8 #23485

wants to merge 2 commits into from

Conversation

NickHu
Copy link
Contributor

@NickHu NickHu commented Mar 4, 2017

Motivation for this change

Update qutebrowser dependencies for #23244

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

Please look at #23484 first; this commit is on top of that.

@mention-bot
Copy link

@NickHu, thanks for your PR! By analyzing the history of the files in this pull request, we identified @abbradar, @FRidh and @lovek323 to be potential reviewers.

@peterhoeg
Copy link
Member

Please run nox-review wip against this (I'm sure @FRidh will otherwise ask you to)...

wip works against your working tree and as you have already committed the change, the way to invoke nox-review is as follows:

nox-review wip --against HEAD~2

The number 2 is because you have to go 2 commits back.

@FRidh
Copy link
Member

FRidh commented Mar 5, 2017

Here's a Hydra build of most of the Python packages.
https://headcounter.org/hydra/eval/352120

This seems to break pyqt4.

@FRidh
Copy link
Member

FRidh commented Mar 5, 2017

or nox-review pr 23485

@NickHu
Copy link
Contributor Author

NickHu commented Mar 5, 2017

I have no idea why that happens or how I would fix that. Are we sure it's not caused by the wider change here: http://lists.science.uu.nl/pipermail/nix-dev/2017-February/022900.html ?

@FRidh
Copy link
Member

FRidh commented Mar 8, 2017

pyqt4 depends directly on sip.

$ nix-build -A pythonPackages.pyqt4
...
b3y3vfl2p1ma-python2.7-sip-4.19.1/include -I/nix/store/l4v7h3zaiffrnqfqzy60f14h0s1mcp7a-python-2.7.13/include/python2.7 -I../../QtCore -I. -I. -o qpycore_chimera.o qpycore_chimera.cpp
qpycore_chimera.cpp: In member function 'void Chimera::set_flag()':
qpycore_chimera.cpp:557:22: error: 'pyqt4ClassTypeDef' was not declared in this scope
         _is_flag = ((pyqt4ClassTypeDef *)_type)->flags & 0x01;
                      ^
qpycore_chimera.cpp:557:41: error: expected primary-expression before ')' token
         _is_flag = ((pyqt4ClassTypeDef *)_type)->flags & 0x01;
                                         ^
qpycore_chimera.cpp:557:42: error: expected ')' before '_type'
         _is_flag = ((pyqt4ClassTypeDef *)_type)->flags & 0x01;
                                          ^
make[2]: *** [Makefile:290: qpycore_chimera.o] Error 1
make[2]: Leaving directory '/tmp/nix-build-python2.7-PyQt-x11-gpl-4.11.3.drv-0/PyQt-x11-gpl-4.11.3/qpy/QtCore'
make[1]: *** [Makefile:7: all] Error 2
make[1]: Leaving directory '/tmp/nix-build-python2.7-PyQt-x11-gpl-4.11.3.drv-0/PyQt-x11-gpl-4.11.3/qpy'
make: *** [Makefile:3: all] Error 2
builder for ‘/nix/store/x5b16hxjl1v4f0ynkkrvqi7vb77hsrc5-python2.7-PyQt-x11-gpl-4.11.3.drv’ failed with exit code 2
error: build of ‘/nix/store/x5b16hxjl1v4f0ynkkrvqi7vb77hsrc5-python2.7-PyQt-x11-gpl-4.11.3.drv’ failed

@abbradar
Copy link
Member

abbradar commented Mar 8, 2017

abbradar@11f4ade fixes that for me.

@abbradar
Copy link
Member

abbradar commented Mar 8, 2017

BTW PyQt 5.8.1 is available.

@abbradar
Copy link
Member

abbradar commented Mar 9, 2017

I've merged this in e7a432d and 0a3b7f9 and tested locally -- seems fine with PyQt4 update. Thanks!

@abbradar abbradar closed this Mar 9, 2017
@NickHu NickHu deleted the pyqt branch August 22, 2017 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants