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
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
