JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,483 Commits 2 Branches 0 Tags 13 GiB
4fab99a195
Commit Graph

307 Commits

Author SHA1 Message Date
Vladimír Čunát
84262c18e3 pygtk: propagate gtk (fixes solfege build) 2013-06-13 13:02:24 +02:00
Song Wenwu
2ff588bb5d pygame: update to 1.9.1 
Enable PNG and JPEG support
Use pygame-v4l patch from AUR
 2013-06-09 12:12:15 +08:00
Ricardo M. Correia
96b01e999f setuptools: Fix download link (the old one was returning 404) 2013-05-31 01:09:44 +00:00
Shea Levy
47cbc4cead Missed some darwin cflags in gyp 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-28 18:38:22 -04:00
Shea Levy
c982e84df4 gyp: Fix on darwin 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-05-28 18:38:22 -04:00
Lluís Batlle i Rossell
ac4dcaba52 Adding pygobject3 (for bluez4). 
bluez-simple-agent fails to work otherwise.
We discussed this a bit on #486, and this looks like the simplest way to
get bluez-simple-agent again.
 2013-05-09 19:11:30 +00: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
Evgeny Egorochkin
7280f5a44f python sip: Advance to version 4.14.6. Note: Needed for KDE4.10 to build. 
Patch contributed by Karn Kallio.
 2013-05-06 22:15:06 +03:00
Vladimír Čunát
f670aa50d7 dbus-python: update the ancient version 
This was probably the root of #379.
 2013-03-15 01:09:57 +01:00
Cillian de Róiste
579082350c pygobject, revert accidental change 
I suspect we don't need the postInstall step which moves pygtk.pth to pygobject.pth
any more, but I didn't mean to include it in this change set
 2013-03-15 01:06:55 +01:00
Cillian de Róiste
0d191de368 Fix wicd to find the python gobject on its PYTHONPATH 2013-03-14 01:22:55 +01:00
Florian Friesdorf
de36ddf7e7 add older pycrypto25 2013-03-09 10:24:38 +01:00
Shea Levy
7410a36dec Merge remote-tracking branch 'upstream/pygobject-2.28.6' 
This branch updates pygobject (the diff itself is trivial), which
affects a lot of packages but due to the recent stdenv merge this seems
like a good time for this.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-08 19:05:25 -05:00
Cillian de Róiste
e42e498e60 pygobject: update to 2.28.6 
This fixes an issue with MyPaint: https://gna.org/bugs/?20400
 2013-03-06 23:25:46 +01:00
Eelco Dolstra
0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Rickard Nilsson
3e2e62ca31 python-sip: Add extra source url 2013-01-21 19:06:54 +01:00
Florian Friesdorf
c6b874be2f fix offlineDistutils (#271), needs to be in a site-packages subdir 2013-01-21 12:12:03 +01:00
Florian Friesdorf
a865154f62 Add myself as (additional) maintainer to all python packages. 2013-01-21 04:44:25 +01:00
Rickard Nilsson
1886d1db6a Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-01-20 16:53:21 +01:00
Florian Friesdorf
8f0ea2b4c0 pythonPackages: default to python's maintainers and platforms 2013-01-19 18:32:03 +01:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Cillian de Róiste
b85a093b07 pythonPackages.virtualenv: update to 1.8.4 2013-01-17 00:18:02 +01:00
Florian Friesdorf
bfa0495344 remove old inactive pth file creation for buildInputs 2013-01-15 17:52:53 +01:00
Florian Friesdorf
24d48d9170 don't put propagated recursivePthLoader into pth file, #257 2013-01-11 18:04:27 +01:00
Florian Friesdorf
a7a6173a3f pygtk in pythonPackages, checks disabled, demo works, relates #223 
Previously the checkPhase was not executed. It is now and a couple of
issues with it are seded away.
 2013-01-11 17:45:26 +01:00
Florian Friesdorf
59879f6496 fixup: pygobject rename pth 2013-01-11 16:11:07 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Florian Friesdorf
e856c72159 pygobject: in pythonPackages, removed hack handled now by pth 2013-01-11 15:30:56 +01:00
Florian Friesdorf
87423443b8 pycairo: move to pythonPackages 2013-01-11 15:23:44 +01:00
Florian Friesdorf
a59164e931 modules propgate recursivePthLoader 
An alternative would be to include it with the plain `python`.
 2013-01-11 10:54:25 +01:00
Florian Friesdorf
212b4df91c recursivePthLoader included via wrapper, not propagated by modules 2013-01-11 09:53:28 +01:00
Florian Friesdorf
42d49b47ba comment unneeded buildInputStrings 2013-01-10 12:50:17 +01:00
Florian Friesdorf
0f52f5a945 Revert "don't propagate recursivePthLoader, it is needed to process it already" 
This reverts commit edd160452e.

If we propagate it, derivations that use a python package will also
get the recursivePthLoader needed to process the pth files of the
package.
 2013-01-09 22:29:46 +01:00
Florian Friesdorf
1cd2bd460b whitespace 2013-01-09 22:29:41 +01:00
Florian Friesdorf
06ca1e4768 Merge branch 'channel-nixos' into python 2013-01-09 22:18:38 +01:00
Rob Vermaas
cfdf35d6f9 Add preInstall ot buildPythonPackage (postInstall already existed) to allow selenium to work properly again. 2013-01-09 15:46:14 +01:00
Florian Friesdorf
6654cb8a10 comment 2013-01-09 05:21:01 +01:00
Lluís Batlle i Rossell
b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates 
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
 2012-12-28 23:28:16 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Florian Friesdorf
edd160452e don't propagate recursivePthLoader, it is needed to process it already 2012-12-22 02:41:10 +01:00
Florian Friesdorf
aab93e8479 do not create e.g pth file for build inputs 
if they are really needed they will be in pth file created by
easy_install. If that does not work, they need to be put into
propagatedBuildInputs or the setup.py fixed.

see #210
 2012-12-22 02:35:04 +01:00
Florian Friesdorf
aeef72fa85 python-modules: remove long non-functional propagated-user-env-packages 
we use recursive processing of pth files instead
 2012-12-22 02:18:29 +01:00
Florian Friesdorf
27a73428cc remove site.py files 
setuptools site.py can't resolve recursively which is needed for nix,
as each package has its own directory. A different solution than
putting the loader into every package output needs to be found.

see also #209
 2012-12-22 02:15:08 +01:00
Florian Friesdorf
ad55bb39ba prefix setuptools -> python-setuptools 2012-12-22 01:15:16 +01:00
Florian Friesdorf
886742d91a use recursivePthLoader instead of setuptoolsSite 2012-12-22 01:13:23 +01:00
Florian Friesdorf
0fb9688235 python prefix for recursive pth loader and fix typo 2012-12-14 19:47:51 +01:00
Florian Friesdorf
6278dabe5d python: do not delete site.py for now as it breaks existing use cases 
see #209, thx shlevy for reporting this
 2012-12-07 11:44:46 +01:00
Florian Friesdorf
78be948175 change order of phases for python modules: checkPhase after installPhase 
at least pycrypto it helps
 2012-12-05 11:31:28 +01:00
Florian Friesdorf
3cf96816b0 pycrypto for python26 and 27 2012-12-05 11:31:28 +01:00
Florian Friesdorf
cd905b16af pil uses buildPythonPackage and is now actually also built for 2.6 2012-12-05 11:31:27 +01:00
Florian Friesdorf
17597e8350 propagate setuptoolsSite to load pth files 2012-12-03 05:20:50 +01:00
Florian Friesdorf
e50571e29d setuptoolsSite - only setuptools' site.py 2012-12-03 05:20:04 +01:00
Florian Friesdorf
d4d76a8443 make diff to master look nicer 2012-12-03 04:41:19 +01:00
Florian Friesdorf
3438681d80 Merge branch 'channel-nixos' into python-merge 2012-11-29 21:40:33 +01:00
Florian Friesdorf
a4ded47776 include offlineDistutils in preConfigure instead of configurePhase 2012-11-29 15:29:41 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Florian Friesdorf
92a833604c Merge branch 'py/offline-distutils' into python-merge 
Conflicts:
	pkgs/development/python-modules/generic/builder.sh
	pkgs/development/python-modules/generic/default.nix
 2012-11-24 22:49:19 +01:00
Florian Friesdorf
74d963c69a offlineDistutils in PYTHONPATH in configurePhase instead of builder.sh 
Conflicts:
	pkgs/development/python-modules/generic/default.nix
 2012-11-24 22:34:09 +01:00
Florian Friesdorf
bdccb5417b fix python module builder 2012-11-23 18:33:33 +01:00
Florian Friesdorf
ccb5d0fc19 fix python module builder 2012-11-23 18:33:25 +01:00
Florian Friesdorf
1171166518 Merge branch 'py/offline-distutils' into python-merge 2012-11-23 17:39:23 +01:00
Florian Friesdorf
337d16368a fix builder in python-module 2012-11-23 17:38:31 +01:00
Florian Friesdorf
ddbd5c2eba Merge branch 'py/offline-distutils' into python-merge 
Conflicts:
	pkgs/development/python-modules/generic/default.nix
 2012-11-23 17:28:51 +01:00
Florian Friesdorf
ad8a4c73fa use offline-disutils in buildPythonPackage 2012-11-23 17:27:55 +01:00
Florian Friesdorf
224251d104 python-offline-distutils 2012-11-23 17:27:12 +01:00
Florian Friesdorf
dce76a387d Merge branch 'py/pth-create' into python-merge 
Conflicts:
	pkgs/development/python-modules/generic/default.nix
 2012-11-23 15:57:09 +01:00
Florian Friesdorf
fa1c8fef2f move pth rename and site.py removal to buildPhase 
This leaves the installCommand to be only easy_install and makes it
easy again to overwrite this.
 2012-11-23 15:54:55 +01:00
Florian Friesdorf
24fd592d64 Merge branch 'py/always-unzip' into python-merge 
Conflicts:
	pkgs/development/python-modules/generic/default.nix
 2012-11-22 13:39:05 +01:00
Florian Friesdorf
bd443d69c9 Merge branch 'py/pth-recursive' into python-merge 2012-11-22 13:37:51 +01:00
Florian Friesdorf
9a6b4e5621 Merge branch 'py/pth-create' into python-merge 2012-11-22 13:37:46 +01:00
Michael Raskin
8b7d12d0f5 Gajim: make OpenSSL code work 2012-09-13 18:03:50 +04:00
Florian Friesdorf
30ffafb47d recursive pth loader 2012-07-23 09:10:57 +02:00
Florian Friesdorf
f8d3671629 fix pth files 2012-07-22 02:08:00 +02:00
Florian Friesdorf
a40da09b44 python: create pth files for python build inputs (propagate/native or not) 2012-07-21 01:55:50 +02:00
Florian Friesdorf
5c564f26f0 python: always unzip eggs installed into the store 
grepping and tagging are two use cases coming to mind
 2012-07-21 00:20:21 +02:00
Florian Friesdorf
2c3ffeb79c python: remove colliding site.py* files 2012-07-21 00:14:03 +02:00
Florian Friesdorf
e7c1aa52cc python: rename eventually created easy_install.pth to pkg-specific file 2012-07-21 00:11:02 +02: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
Yury G. Kudryashov
888a6507e6 sip-4.13.2 
svn path=/nixpkgs/trunk/; revision=34395
 2012-06-09 13:09:07 +00:00
Joachim Schiele
1181658cb8 this won't compile yet as there is a python problem, probably related to what marc weber already fixed. will fix that later 
svn path=/nixpkgs/trunk/; revision=34388
 2012-06-08 15:57:53 +00:00
Eelco Dolstra
eed22970cd * Updated to pycrypto to 2.6. 
svn path=/nixpkgs/trunk/; revision=34291
 2012-05-30 21:12:04 +00:00
Cillian de Roiste
531b63a389 Patching python-virtualenv so that it doesn't fail if the python version is specified, e.g. --python=python2.7, and now iff the python version is specified it successfully also installs additional libs such as readline into the virtualenv 
svn path=/nixpkgs/trunk/; revision=34184
 2012-05-19 23:15:50 +00:00
Peter Simons
1cdbd5add0 numpy: reverted build fix that committed earlier on behalf of Konrad Hinsen 
The patch broke the build of matplotlib.

svn path=/nixpkgs/trunk/; revision=34023
 2012-05-09 07:22:18 +00:00
Peter Simons
6c37520d2a numpy: fixed build (patch by Konrad Hinsen) 
svn path=/nixpkgs/trunk/; revision=33941
 2012-04-28 14:14:16 +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
Florian Friesdorf
962e6fb704 Revert "python site.py that loads pth files anywhere on PYTHONPATH" 
This reverts commit fac80449abd57c271dfb98d392e49e4135dfc50c.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32663
 2012-02-28 00:08:00 +00:00
Florian Friesdorf
833023d85a Revert "pth file with deps, only current package's scripts, no colliding files" 
This reverts commit 3a37caa6a278fb244eac4a6bb1452d1914159be8.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32662
 2012-02-28 00:07:56 +00:00
Florian Friesdorf
363579bc09 Revert "clean setuptools from colliding files - it is not using buildPythonPkg" 
This reverts commit 9bc390eb7b9bcbe8b4951797010efd27afbe7afd.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32661
 2012-02-28 00:07:53 +00:00
Florian Friesdorf
3b39dff906 Revert "include site for python wrappers to enable deps via pth files" 
This reverts commit dca280ab0b668553c50506ab7b31284e8477a803.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32660
 2012-02-28 00:07:48 +00:00
Florian Friesdorf
43e16d04b9 Revert "prevent distutils during module install from downloading and load pth files" 
This reverts commit 2a151d9df99f68c555a9f1fd2c80b8889561e9e3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32659
 2012-02-28 00:07:42 +00:00
Florian Friesdorf
9159a78807 Revert "insert pth eggs at index of site-packages they come from" 
This reverts commit daa626efe76d8602c7892aaa338d526ea88bfe1b.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32658
 2012-02-28 00:07:39 +00:00
Florian Friesdorf
e20d04408e Revert "meta for offline-distutils" 
This reverts commit 8fcf025e5f80519a6f06c0b36aee007fe16a6e31.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32657
 2012-02-28 00:07:36 +00:00
Florian Friesdorf
4b4f6ece3e Revert "removal of deps' scripts only if easy-install.pth exists" 
This reverts commit a74507f63e2af67cf64dc3e67bfbf2771120f67e.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32655
 2012-02-28 00:07:30 +00:00
Florian Friesdorf
2d2c8b3e59 Revert "include site in pythonpath of wrapped scripts, if python-site is installed" 
This reverts commit 1ac12b0d4b64936104cb6031b02c92c3d1845ae5.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32654
 2012-02-28 00:07:27 +00:00
Florian Friesdorf
2ea5e2b576 Revert "suffix pythonpath" 
This reverts commit a9a2b1e0dd8cdbb1dff3253d303b35d41f29b0f9.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32652
 2012-02-28 00:07:19 +00:00
Florian Friesdorf
92da3fd865 Revert "PYTHONPATH in preConfigure instead of configurePhase" 
This reverts commit a9873e9412d5ffb333baaf33502c8dff62548fa6.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32651
 2012-02-28 00:07:16 +00:00
Florian Friesdorf
e545a9944a Revert "added unzip to buildPythonPackage's buildInputs - used quite often" 
This reverts commit f067ecb4911f154fe2c64434abdc5a8b79625f5a.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32644
 2012-02-28 00:06:52 +00:00
Florian Friesdorf
178b5b9c5b Revert "move checkPhase after fixupPhase for python packages" 
This reverts commit 413c44da228754018a2920cb556303e803a9d488.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32643
 2012-02-28 00:06:49 +00:00
Florian Friesdorf
013c915777 Revert "enable preConfigure for python packages again" 
This reverts commit a513314290ba0d78400ea4902301f421e0fecdd2.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32642
 2012-02-28 00:06:46 +00:00