3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

63 commits

Author SHA1 Message Date
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
宋文武 93feb5d115 drop my maintainership (close #13881) 2016-03-13 18:39:01 +01:00
Gabriel Ebner 7c28451287 pyqt5: 5.4.2 -> 5.5.1 2016-01-07 18:46:50 +01:00
Thomas Tuegel 05dbd07cd1 pyqt5: Qt 5 infrastructure update 2015-12-20 07:56:39 -06:00
Frederik Rietdijk 7d08a9c877 python pyqt: add python.libPrefix 2015-12-11 11:28:31 +01:00
Kirill Elagin 6209961810 pyqt5: make it actually 5.4.2 2015-06-28 02:18:58 +03:00
Arseniy Seroka f893ac0622 pyqt5: 5.3 -> 5.4.2 2015-06-28 00:28:19 +03:00
Vincent Laporte 78ea82f11c pyqt4: update from 4.10.2 to 4.11.3 2014-12-24 13:59:57 +01:00
Vincent Laporte 81a2b58c39 nixpkgs: remove redundant attribute sip
Because:

 1. It is a mere alias of `pythonPackages.sip`
 2. It is usually not needed since propagated by `pyqt4`
 3. It makes it easy to have a packages depend on two different versions
 of sip
2014-12-23 19:37:21 +01:00
Domen Kožar d3ed0ab32b PyQt: fix build 2014-12-09 13:23:13 +01:00
宋文武 f44c056490 add pyqt5 2014-07-07 14:23:55 +08:00
Vladimír Čunát 15a19994c9 kde4(10).pykde4: fix build via downgrading sip and pyqt4
Cf. 501008ad6f (commitcomment-5080684)
2014-01-16 08:59:31 +01:00
Song Wenwu 501008ad6f pyqt4: update to 4.10.3 and add python3 support
also add python3 support for dbus-python
2014-01-11 20:07:29 +01:00
Evgeny Egorochkin a08fba4fce PyQt4: Advance version to 4.10.1. Note: needed for KDE4.10 to build.
Patch contributed by Karn Kallio.
2013-05-06 22:15:06 +03:00
Lluís Batlle i Rossell 95072d1485 pyqt: Adding a new url; the old does not work anymore. 2012-07-02 21:00:09 +02:00
Yury G. Kudryashov eef17e625f pyqt-4.9.1
svn path=/nixpkgs/trunk/; revision=34396
2012-06-09 13:09:13 +00:00
Lluís Batlle i Rossell 32d84a2338 Adding a mirror for the pyqt version we use; the usual upstream channel does not
have the file anymore.


svn path=/nixpkgs/trunk/; revision=33917
2012-04-25 13:56:08 +00:00
David Guibert f58ae30dfd update python modules: sip and pyqt
svn path=/nixpkgs/trunk/; revision=28444
2011-08-09 20:39:19 +00:00
Eelco Dolstra 9379248ef3 * Update kdeadmin and kdegames.
svn path=/nixpkgs/branches/kde-4.7/; revision=27898
2011-07-22 01:28:09 +00:00
Eelco Dolstra 5a03576cb4 * Update kdegames.
svn path=/nixpkgs/branches/kde-4.7/; revision=27894
2011-07-21 21:54:40 +00:00
Eelco Dolstra 8b4730bdbd * Update pycups, PyQt and SIP.
svn path=/nixpkgs/branches/kde-4.7/; revision=27889
2011-07-21 20:14:17 +00:00
Eelco Dolstra bf8e36dd4f * Revert PyQt and sip because the upgrade breaks KDE, but use
tarballs on nixos.org.

svn path=/nixpkgs/trunk/; revision=26164
2011-03-04 19:57:52 +00:00
Lluís Batlle i Rossell 31c38d7dd2 Updating pyqt and sip because the 'src' there mentioned is not at the urls anymore.
svn path=/nixpkgs/trunk/; revision=26152
2011-03-04 09:48:29 +00:00
Yury G. Kudryashov 8f07ddbdbb PyQt-4.8.1
svn path=/nixpkgs/trunk/; revision=24837
2010-11-24 10:48:25 +00:00
Yury G. Kudryashov 0a28239504 Make pyqt-dbus work
svn path=/nixpkgs/trunk/; revision=23519
2010-08-29 19:36:54 +00:00
Eelco Dolstra ee182f843f * Urgh, riverbankcomputing.co.uk constantly removed old releases. We
should mirror them.

svn path=/nixpkgs/branches/x-updates/; revision=22656
2010-07-19 08:25:09 +00:00
Sander van der Burg 0de19dec3b - Upgraded SIP to 4.10.2
- Upgraded PyQt to 4.7.3


svn path=/nixpkgs/trunk/; revision=21203
2010-04-21 12:06:28 +00:00
Eelco Dolstra e2a374799f * Reverted most of the recent Python refactorings, as discussed. It's
a worthy goal to move the Python packages that are currently in
  all-packages.nix into a single attribute set, but this doesn't
  require moving python-packages.nix or the other changes made to that
  file.  The Python packages in all-packages.nix should simply be
  moved to python-packages.nix, and ideally changed to use
  buildPythonPackage.

svn path=/nixpkgs/trunk/; revision=21196
2010-04-21 10:51:15 +00:00
Marc Weber 8c0b7e4ad2 - adding experimental python31 build
- cleanup python libraries:
 * moving all python libraries into a attr set into a directory
   so that expressions can be used for both: python 2.5 and 2.6 easily
 * disabling packages which don't build

svn path=/nixpkgs/trunk/; revision=21142
2010-04-17 18:28:25 +00:00