JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,287 Commits 2 Branches 0 Tags 13 GiB
bc7b39784a
Commit Graph

443 Commits

Author SHA1 Message Date
Vladimír Čunát
4c5a71f777 Merge master into x-updates 
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
 2013-12-18 23:21:29 +01:00
Evgeny Egorochkin
c53d8c81f5 pycrypto: remove version 2.5 since it's vulnerable to CVE-2012-2417, CVE-2013-1445 2013-12-13 11:13:23 +02:00
Vladimír Čunát
6690c97569 Merge branch 'master' into x-updates 
Conflicts (just different styles, same semantics):
	pkgs/development/libraries/libusb1/default.nix
 2013-12-07 14:17:16 +01:00
Nixpkgs Monitor
a830c0eb9d pyopenssl: update from 0.13 to 0.13.1, potentially fixes CVE-2013-4314 2013-12-04 05:26:34 +02:00
Nixpkgs Monitor
e3f69c5dcc python33Packages.pycrypto: update from 2.6 to 2.6.1, potentially fixes CVE-2013-1445 2013-12-04 05:25:38 +02:00
Vladimír Čunát
b5fba47147 Merge branch master into x-updates 
Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix
 2013-11-23 10:22:26 +01:00
Rok Garbas
d14831c5da zc_buildout_nix: update to 2.2.1 2013-11-21 12:30:04 +01:00
Vladimír Čunát
017b36a5df dbus_python: update 1.1.1 -> 1.2.0 2013-11-17 15:10:46 +01:00
Cillian de Róiste
bfac9f828e Bugfix: zc_buildout_nix, replace links to eggs in the store which have been gc-ed 2013-10-08 01:51:24 +02:00
Eelco Dolstra
2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +02:00
Bjørn Forsman
083d0890f5 More description fixes 
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
 2013-10-06 12:01:38 +02:00
aszlig
ae47ba445c
python-gyp: Fix no-xcode.patch for Darwin. 
The last hunk of the patch doesn't apply anymore and causes a build
failure on Darwin systems:

https://hydra.nixos.org/build/6294943

Fixed the hunk manually.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-09-27 15:52:44 +02:00
aszlig
ad4156e497
python-blivet: Fix udev path for Debian Wheezy. 
Only affects "useNixUdev = false" and we now include the udev paths for
the latest Debian Wheezy release, so we can properly deploy Hetzner
machines with NixOps again as they've updated their rescue system to
Wheezy.

This fixes NixOS/nixops#137, thanks to @lovek323 for reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-09-20 13:13:37 +02:00
Bjørn Forsman
cadc9a03a7 recursive-pth-loader: fix python path 
This should work for both python2 and python3.
 2013-09-08 22:07:20 +02:00
Ricardo M. Correia
5f3b19e661 recursive-pth-loader: build sitecustomize.pyc 
If this file is not created at build time, then python (when run as root) will
create it at run time and mess up the consistency of the nix store.
 2013-09-08 21:21:28 +02:00
Cillian de Róiste
01cc4301f3 Add a patched version of buildout 2.2.0 for development with nix 
Without this patch buildout will copy eggs from the nix store into the
./eggs directory and then try to compile them. This fails because they
are read only. This patch changes the behaviour to create symlinks to
eggs available in the nix store instead of copying them, and not to
try to compile the eggs in the store. To differentiate this from the
default buildout (which may be provided otherwise e.g. as a
dependency) the executable is renamed to buildout-nix.

This can be used in conjuntion with myEnvFun to create development
environments which make use of the python modules available in the
store while downloading any additional required eggs. A pleasant side
effect is that you can conveniently replace the symlink with a copy
for debugging purposes.
 2013-08-28 00:26:06 +02:00
Domen Kožar
7ef49ddee5 setuptools: add note why darwin tests are disabled 2013-08-23 12:41:19 +02:00
Jason "Don" O'Conal
32a3516b2c pythonPackages.googlecl: add expression 2013-08-06 09:43:57 +10:00
aszlig
9b9fa35ebd
blivet: Update sha256, as it changed upstream. 
The sha256 was magically changed upstream with the same contents but
different timestamps, so let's update it. Thanks to @rbvermaa for
noticing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-08-02 10:59:06 +02:00
Domen Kožar
332dd4854f Move namePrefix="" python packages out of python-packges.nix 
It doesn't make sense to build tools/applications with three different
python interpreter versions, so move them out of python modules list.

Also reverts 53ffc6e0ef.
 2013-07-31 13:34:11 +02:00
Domen Kozar
7458f29dc9 don't wrap scripts in EGG-INFO/scripts since they are called from python 2013-07-29 19:31:58 +02:00
Domen Kozar
918e5efb99 recurse into python33 and pypy packages 2013-07-29 14:52:19 +02:00
Domen Kozar
4993f07fee python: include python version when prefixing python packages 2013-07-29 12:09:06 +02:00
Domen Kozar
5ec6cf3756 add python3 support to pythonPackages 2013-07-29 12:09:06 +02:00
Domen Kozar
8525695a72 sqlalchemy: add the patch so that things work, you know 2013-07-28 17:13:19 +02:00
Evgeny Egorochkin
b98fccf486 pyside-generatorrunner: fix version to match sources 2013-07-19 07:50:27 +03:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin
bb48cab777 Fix licenses. My fixes were more carefully checked against sources and home page license claims :) 2013-07-14 02:11:41 +03:00
Evgeny Egorochkin
58988f3325 python-rhpl: fix mirror. unfortunately can't use mirror://fedora for this because this is a very old 
package which isn't hosted by all the mirrors.
 2013-07-14 02:08:54 +03:00
Shea Levy
3b274caaac Fix tarball 
Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-07-13 15:54:39 -04:00
Jason \"Don\" O'Conal
fbe2fe36e3 sip: fix build on darwin 
* prevent complaints about python not being built as a framework
 2013-07-12 16:26:47 +02:00
aszlig
ad9af11c1a
python-blivet: Allow to use external udev. 
This allows blivet to be used outside of NixOS and with a different udev SO
major number. Particularily, this is needed for the NixOps Hetzner backend which
is coming soon :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-08 14:27:42 +02:00
aszlig
231b182c36
python-blivet: Move into python-modules/blivet. 
This is in preparation for adding overridable function attributes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2013-07-08 14:27:42 +02:00
Vladimír Čunát
4a0952d2fa fix bad "licence" names 
Mostly what I merged from @lovek323.
Such errors can be easily checked by
  nix-env -f . -qa \* --meta --xml --drv-path --show-trace >/dev/null
 2013-07-04 18:16:34 +02:00
Evgeny Egorochkin
09e6ae577b Python: add DETERMINISTIC_BUILD env var. If set, python doesn't write timestamps to pyc files. Tested by 
building argparse, compiling from cli, compiling using py_compile.
 2013-06-22 09:45:01 +03:00
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
Florian Friesdorf
3c51235920 enable preConfigure for python packages again 
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32626
 2012-02-27 17:34:08 +00:00
Florian Friesdorf
d16a15c0a5 move checkPhase after fixupPhase for python packages 
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32625
 2012-02-27 17:34:02 +00:00
Florian Friesdorf
9e646d4689 added unzip to buildPythonPackage's buildInputs - used quite often 
authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32624
 2012-02-27 17:33:55 +00:00
Florian Friesdorf
6d7dfd1415 PYTHONPATH in preConfigure instead of configurePhase 
enables a normal configurePhase also for python packages (e.g. libxml2
python bindings)

authored by: chaoflow, goibhniu

svn path=/nixpkgs/branches/stdenv-updates/; revision=32595
 2012-02-26 17:23:47 +00:00
Florian Friesdorf
eb35e3bd13 suffix pythonpath 
this is already the case for the pythonXYFull

svn path=/nixpkgs/branches/stdenv-updates/; revision=32594
 2012-02-26 17:23:44 +00:00
Florian Friesdorf
d670c0e45c include site in pythonpath of wrapped scripts, if python-site is installed 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32592
 2012-02-26 17:23:38 +00:00
Florian Friesdorf
c6893a14df removal of deps' scripts only if easy-install.pth exists 
solves duplicate installation for packages that do not use setuptools

svn path=/nixpkgs/branches/stdenv-updates/; revision=32591
 2012-02-26 17:23:35 +00:00
Florian Friesdorf
0f81888e09 meta for offline-distutils 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32586
 2012-02-26 17:23:20 +00:00
Florian Friesdorf
59d4678e83 insert pth eggs at index of site-packages they come from 
thx Rok Garbas!

svn path=/nixpkgs/branches/stdenv-updates/; revision=32584
 2012-02-26 17:23:13 +00:00
Florian Friesdorf
d52e2c7c41 prevent distutils during module install from downloading and load pth files 
based on a patch by Cillian de Róiste

svn path=/nixpkgs/branches/stdenv-updates/; revision=32583
 2012-02-26 17:23:09 +00:00
Florian Friesdorf
ccb34b093f include site for python wrappers to enable deps via pth files 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32582
 2012-02-26 17:23:05 +00:00
Florian Friesdorf
8adcbec448 clean setuptools from colliding files - it is not using buildPythonPkg 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32581
 2012-02-26 17:23:02 +00:00
Florian Friesdorf
6ccd671e5b pth file with deps, only current package's scripts, no colliding files 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32580
 2012-02-26 17:22:59 +00:00
Florian Friesdorf
cb1009a3fb python site.py that loads pth files anywhere on PYTHONPATH 
This file is normally created by easy_install / distutils, but removed
and packaged separately to avoid collisions and allow for more use cases.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32579
 2012-02-26 17:22:55 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Eelco Dolstra
633a194994 * PIL updated to 1.1.7. 
svn path=/nixpkgs/trunk/; revision=31142
 2011-12-29 16:53:14 +00:00
Florian Friesdorf
d8e5cb01b5 pyside-1.0.9 
svn path=/nixpkgs/trunk/; revision=30950
 2011-12-17 20:16:45 +00:00
Eelco Dolstra
cac34d2be5 * Applied a patch to get Euca2ools / Boto to work on Python 2.7. 
svn path=/nixpkgs/trunk/; revision=29956
 2011-10-21 15:01:40 +00:00
Yury G. Kudryashov
2ed828052e Remove wxPython26 since it is not used 
svn path=/nixpkgs/trunk/; revision=29773
 2011-10-11 19:46:31 +00:00
Eelco Dolstra
a3a15545f6 * wxPython updated to 2.8.12.0. 
svn path=/nixpkgs/trunk/; revision=29395
 2011-09-20 11:19:55 +00:00
David Guibert
c716ac66e0 add jbrout, a photo manager using IPTC keywords/EXIF 
svn path=/nixpkgs/trunk/; revision=28759
 2011-08-22 20:26:11 +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
23831b76e3 * dbus-python updated to 0.84.0. 
svn path=/nixpkgs/branches/kde-4.7/; revision=27882
 2011-07-21 17:31:57 +00:00
Eelco Dolstra
345b9a75d5 * Move wxPython into python-packages.nix so that you can get wxPython 
built for the appropriate Python version
  (e.g. python26Packages.wxPython).

svn path=/nixpkgs/trunk/; revision=27127
 2011-05-04 08:41:50 +00:00
Eelco Dolstra
a7d4f19ab3 * wxPython updated to 2.8.12.0. 
* wxPython builder: wrap the Python programs (such as pyshell) so that
  they actually work.

svn path=/nixpkgs/trunk/; revision=27122
 2011-05-03 16:57:18 +00:00
Eelco Dolstra
4407e6464f * Remove the hard-coded reference to Python 2.6. 
svn path=/nixpkgs/branches/modular-python/; revision=26676
 2011-04-04 13:28:13 +00:00
Eelco Dolstra
69b974bda6 * Generic Python builder: support preCheck and postCheck. 
svn path=/nixpkgs/branches/modular-python/; revision=26602
 2011-03-30 12:27:04 +00:00
Eelco Dolstra
353d450867 * wrapPythonPrograms: don't hard-code the Python library prefix. 
svn path=/nixpkgs/branches/modular-python/; revision=26594
 2011-03-29 15:19:59 +00:00
Eelco Dolstra
11b67ccee5 * Move buildPythonPackage and setuptools into python-packages.nix. 
This ensures that they're built with the same "python" argument.

svn path=/nixpkgs/branches/modular-python/; revision=26593
 2011-03-29 15:02:15 +00:00
Eelco Dolstra
968496e69b * wrapPythonPrograms: rewrite the common "#! .../env python" idiom to 
"#! .../python".

svn path=/nixpkgs/branches/modular-python/; revision=26583
 2011-03-28 17:19:27 +00:00
Eelco Dolstra
47adaa80e3 * Move the wrapPythonPrograms function into a separate setup hook 
(wrapPython).

svn path=/nixpkgs/branches/modular-python/; revision=26580
 2011-03-28 16:33:33 +00:00
Eelco Dolstra
120d1757fe * buildPythonPackage: added an argument `pythonPath' to specify Python 
dependencies that are *not* propagated to the user environment
  (as opposed to `propagatedBuildInputs').  For instance, if you
  install `iotop', you typically don't want its Python dependencies
  polluting the user environment.
  
* buildPythonPackage: some cleanup (e.g. use function argument
  defaults instead of `if attrs ? foo then attrs.foo else []').

svn path=/nixpkgs/branches/modular-python/; revision=26571
 2011-03-28 15:30:48 +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
e02f6ba5f3 Update python-sip 
svn path=/nixpkgs/trunk/; revision=24836
 2010-11-24 10:47:48 +00:00
Russell O'Connor
63321806b4 Updating pygobject to latest version 
svn path=/nixpkgs/trunk/; revision=24763
 2010-11-19 04:09:22 +00:00
Eelco Dolstra
f2c1219979 * Updated pygobject and pygtk. 
svn path=/nixpkgs/trunk/; revision=24354
 2010-10-18 22:55:20 +00:00
Peter Simons
600b4b7ee7 Moved "flup" from all-packages.nix into python-packages.nix. 
svn path=/nixpkgs/trunk/; revision=24044
 2010-10-04 09:49:09 +00:00
Michael Raskin
8479512626 Step back PyGTK from the update requiring a lot of too-new code 
svn path=/nixpkgs/trunk/; revision=23652
 2010-09-05 18:57:43 +00:00
Michael Raskin
4926bd7256 Update PyGTK 
svn path=/nixpkgs/trunk/; revision=23651
 2010-09-05 18:10:16 +00:00
Peter Simons
4be79671b4 pkgs/development/python-modules/pygobject: ensure that python code can be found 
svn path=/nixpkgs/trunk/; revision=23616
 2010-09-03 13:18:38 +00:00
Yury G. Kudryashov
0a28239504 Make pyqt-dbus work 
svn path=/nixpkgs/trunk/; revision=23519
 2010-08-29 19:36:54 +00:00
Peter Simons
7b00a8c39f pkgs/development/python-modules/pygtk: move installed python code down one directory hierarchy so that $PYTHONPATH can be guessed 
svn path=/nixpkgs/trunk/; revision=23201
 2010-08-17 10:18:17 +00:00
Peter Simons
65eb1a248f pkgs/development/python-modules/zope: updated to version 3.4.0 
svn path=/nixpkgs/trunk/; revision=23145
 2010-08-12 12:53:45 +00:00
Peter Simons
27fe0c57f3 pkgs/development/python-modules/pycrypto: enable building of this package on all GNU platforms 
svn path=/nixpkgs/trunk/; revision=22794
 2010-07-28 13:10:18 +00:00
Peter Simons
12943b6a3e pkgs/development/python-modules/pycrypto: downgrade to 2.0.1 
The download sites for 2.1.0 all appear to be offline.

svn path=/nixpkgs/trunk/; revision=22793
 2010-07-28 13:09:44 +00:00
Peter Simons
66b8ff8e0c pkgs/development/python-modules/pycrypto: updated homepage and download URL to use http://www.pycrypto.org/ 
svn path=/nixpkgs/trunk/; revision=22789
 2010-07-28 13:07:48 +00:00
Peter Simons
93b18ceb30 pkgs/development/python-modules/generic: parameterize build/install command 
The generic 'buildPythonPackage' function used to use the build/install command
"easy_install" unconditionally. That didn't work for python-numpy, for
instance, because the package wants "setup.py" run with additional parameters
to determine the fortran compiler of choice. The newly introduced function
argument 'installCommand' allows to implement this. By passing that parameter,
the default build command can be overridden.

svn path=/nixpkgs/trunk/; revision=22786
 2010-07-28 13:05:04 +00:00
Peter Simons
4e872b84ee pyOpenSSL: updated to version 0.10 
svn path=/nixpkgs/trunk/; revision=22773
 2010-07-27 23:52:14 +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
Eelco Dolstra
94e5cdd437 * Updated dbus-python. 
svn path=/nixpkgs/trunk/; revision=22470
 2010-07-05 06:33:45 +00:00
Eelco Dolstra
9db799acd5 * pycrypto updated to 2.1.0. 
svn path=/nixpkgs/trunk/; revision=21910
 2010-05-20 10:41:10 +00:00
Michael Raskin
ad1684ae13 Replace codegen script which was failing with EACCESS. Test Gajim build worked fine 
svn path=/nixpkgs/trunk/; revision=21849
 2010-05-18 20:13:39 +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
Yury G. Kudryashov
8ff59ce09c Remove old sip and pyqt 
svn path=/nixpkgs/trunk/; revision=21017
 2010-04-11 21:03:51 +00:00
Lluís Batlle i Rossell
788e40bd5a Updating some py-gtk things. 
With a newer glib, I could have used a newer pyobject.

svn path=/nixpkgs/trunk/; revision=20962
 2010-04-06 19:39:25 +00:00
Sander van der Burg
cc7a6e0b1d Upgraded PyQt to version 4.7.2 
svn path=/nixpkgs/trunk/; revision=20889
 2010-03-31 11:45:33 +00:00
Lluís Batlle i Rossell
a838f24608 Updating and trying to fix the build for pycups 
svn path=/nixpkgs/trunk/; revision=20823
 2010-03-25 13:36:42 +00:00