mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Code Issues Wiki Activity
176628 commits 204 branches 125 tags 10 GiB
Commit graph

91 commits

Author SHA1 Message Date
Jan Tojnar 71f7d6b939
Merge pull request #56745 from jtojnar/ffado-qt5 
ffado: port to qt5
 2019-03-06 00:17:00 +01:00
Jan Tojnar ca50e4937e python2Packages.pyqt4: partial clean up 2019-03-03 08:57:41 +01:00
Jan Tojnar 34fd15c8aa python2Packages.pyqt4: Fix build 2019-03-03 08:57:41 +01:00
Jan Tojnar 1eab40211e
python3Packages.pyqt5: fix building dbus support module 2019-03-03 01:26:22 +01:00
Frederik Rietdijk 6bffe977fe python.pkgs.pyqt5: fix build 2019-02-17 14:40:52 +01:00
Dmitry Kalinkin 3c198294e7
pyqt5: refactor 2018-12-27 09:14:21 -05:00
Dmitry Kalinkin facefec139
pyqt5: make qtwebkit optional, disable by default 
qtwebkit appears to be unsupported in Qt 5.11. We are using some old port
475d653afd/pkgs/development/libraries/qt-5/5.11/default.nix (L39-L48)
and it is broken on darwin.
 2018-12-27 09:14:20 -05:00
Dmitry Kalinkin 9b07d48d9c
pyqt5: remove old fixes 
Since about 5 hydra evaluations ago the build log has:

substituteStream(): WARNING: pattern 'install_dir=pydbusmoddir' doesn't match anything in file 'configure.py'
substituteStream(): WARNING: pattern 'ModuleMetadata(qmake_QT=['webkitwidgets'])' doesn't match anything in file 'configure.py'

Looking at the original configure.py I don't see any mention of
pydbusmoddir and ModuleMetadata seems to be set like the patch suggests:

    'QtWebKitWidgets':      ModuleMetadata(
                                    qmake_QT=['webkitwidgets',
                                            'printsupport']),

It appears that we don't need the fix anymore.

Reverts: d3ed0ab32b ('PyQt: fix build')
 2018-12-27 09:13:07 -05:00
Orivej Desh 4ec84c297c pythonPackages.pyqt5: import sip as PyQt5.sip 
pyqt5 5.11 has switched from sip to PyQt5.sip.
 2018-12-27 11:17:22 +00:00
nyanloutre 05cf0e1107 pythonPackages.pyqt5: link sip module 2018-12-21 14:06:44 +01:00
Robert Schütz d1540531f4 python.pkgs.pyqt5: 5.10.1 -> 5.11.3 2018-12-03 16:50:38 +01:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Bauer 76999cc40e treewide: remove aliases in nixpkgs 
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
 2018-07-18 23:25:20 -04:00
Bastian Köcher 121b15f0c0 pyqt5: Fixes build with Qt 5.11 2018-06-12 14:27:11 +02:00
Johannes Frankenau 163c83e901 python.pkgs.pyqt5: apply patch for cura segfaults 2018-06-10 10:17:19 +02:00
Matthew Justin Bauer bead42df5d
Merge pull request #37639 from Twey/plover-4.0.0.dev6 
Plover 4.0.0.dev6
 2018-05-02 12:49:02 -05:00
James Kay caec3b9e09
PyQt5: 5.10.0 -> 5.10.1 2018-03-22 17:10:25 +00:00
Nikolay Amiantov b1b4c6c4eb pyqt5: propagate Qt dependencies 
This is so that Qt user environment packages are also propagated. Fixes
Electrum environment installations when no other Qt applications are installed.

Added `dev` output so that closure size won't explode.
 2018-03-21 23:36:18 +03:00
Frederik Rietdijk be964d00ea python.pkgs.pyqt5: minor improvements 2018-02-04 10:16:46 +01:00
Frederik Rietdijk e375e77bcf python.pkgs.pyqt5: 5.9.2 -> 5.10 2018-02-03 17:43:30 +01:00
Michael Hoang 67b997c8f0 python.pkgs.pyqt5: 5.9 -> 5.9.2 
Supports up to version Qt 5.9.3
 2017-12-24 05:01:00 +00:00
adisbladis d99378654f pythonPackages: Add version and pname attributes to packages 2017-11-23 17:49:43 +01:00
rittelle 7fa3f8804f pythonPackages.pyqt5: Add optional support for qtconnectivity 2017-11-19 11:18:07 +01:00
Michael Weiss 46bcc0d498 pythonPackages.pyqt5: Add optional qtwebsockets support 
This is e.g. required for gns3-gui 2.1.0. But it seems to break the
build for Python 2.7.
 2017-11-12 19:56:45 +01:00
Thomas Tuegel 4ee379278f
pyqt5: no need to set --qmake in configure 2017-11-07 07:18:49 -06:00
Frederik Rietdijk eedc4e5203 Merge pull request #30032 from dtzWill/update/pyqt-sip 
pyqt,sip: 5.8.1 -> 5.9, 4.19.1 -> 4.19.3
 2017-10-08 08:21:02 +02:00
Will Dietz b70be53c15 pyqt: 5.8.1 -> 5.9 2017-10-02 15:07:18 -05:00
John Ericson 531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs 
Only acts on one-line dependency lists.
 2017-09-21 15:49:53 -04:00
davidak 3270aa896b replace "Mac OS X" and "OS X" with "macOS" 
as it is the official name since 2016

https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop

exception are parts refering to older versions of macOS like

"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
 2017-08-07 21:41:30 +02:00
Thomas Tuegel 210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Frederik Rietdijk 3760c8c7fd Python: replace mkPythonDerivation with buildPythonPackage and format="other"; 
This way all Python packages use the same function,
`buildPythonPackage`.
 2017-03-21 13:01:49 +01:00
Nikolay Amiantov a0f3590c5b pyqt4: 4.11.3 -> 4.12 2017-03-09 15:38:10 +03:00
Nikolay Amiantov 6631000bd3 pythonPackages.pyqt5: 5.8 -> 5.8.1 2017-03-09 15:38:10 +03:00
Nick Hu e7a432db1e python-PyQt: 5.6 -> 5.8 2017-03-09 15:38:10 +03:00
Nikolay Amiantov c226a93a9e pythonPackages.pyqt5: enable qtwebengine support 2017-02-05 15:05:53 +03:00
Frederik Rietdijk f6ccecefd9 Merge pull request #18025 from knedlsepp/fix-python3.5-jupyter-1.0.0 
python3.5-jupyter: Fix build issue #17902
 2016-09-10 11:28:48 +02:00
Michael Raskin 16ce4fa511 pythonPackages.pyqt4: actually use dbus-python to build dbus.mainloop.qt; fixes ffadoFull build 2016-09-07 17:32:52 +02:00
Josef Kemetmueller d12de90e1c pyqt: Fix darwin build 2016-09-04 13:02:53 +02:00
Vladimír Čunát fcc76325ef pyqt*: fixup build to close #18250 
I don't know why the builder uses `lndir ${dbus-python} $out`,
but this commit should work around the problem caused by
dbus-python starting to propagate some inputs.
 2016-09-03 17:13:42 +02:00
Frederik Rietdijk 96a3bf6cea pythonPackages.pyqt4: fix name 2016-09-01 17:42:39 +02:00
Frederik Rietdijk 4f6b6f1472 pythonPackages: use mkPythonDerivation 2016-09-01 16:16:31 +02:00
Nikolay Amiantov 4b2e1998bb pyqt4: update flags like in pyqt5 2016-08-17 20:20:35 +03:00
Nikolay Amiantov 33cabd882f pythonPackages.pyqt5: 5.5.1 -> 5.6 2016-08-17 20:20:35 +03:00
Frederik Rietdijk 5a501bd828 Remove top-level dbus_python and pythonDBus. 
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
 2016-08-16 22:52:37 +02:00
Frederik Rietdijk 6842a24b21 Remove top-level pyqt4 
See #11567.
 2016-08-14 12:38:01 +02:00
Domen Kožar 256394be60 pyqt: propagate python for nix-shell 2016-08-11 17:26:41 +02:00
Thomas Tuegel d130c27c62 pyqt5: run configure hooks 
Fixes #17045.

Whenever a phase is overridden, the pre- and post-hooks for that phase
must be invoked!
 2016-07-19 12:36:09 -05:00
Nikolay Amiantov 38ef2df4a6 pythonPackages.pyqt{,5}: let python.buildEnv detect it 2016-05-14 04:22:50 +03:00
Nikolay Amiantov c161258003 pyqt5: move to qmakeHook 
This reverts commit f1c2572479.
 2016-04-20 18:55:53 +03:00
aszlig f1c2572479
pyqt5: Fix running of {pre,post}Configure 
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of pyqt5 override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of pyqt5 and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2016-04-15 05:26:02 +02:00