alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
59025 commits 217 branches 121 tags 4.5 GiB
Commit graph

439 commits

Author SHA1 Message Date
Austin Seipp 35aa1e2421 Merge pull request #2510 from lovek323/goobook 
goobook: fix build on darwin
 2014-05-18 08:23:34 -05:00
Jason "Don" O'Conal b4be4e5270 pycrypto: fix build on darwin 2014-05-14 11:31:37 +10:00
Peter Simons 1fe094d2b8 pylint: update to version 1.2.1 2014-05-13 16:11:06 +02:00
Chris Double b799aa697d Update pygtk to 2.24.0 to fix CPU pegging issues in xpra 2014-05-08 00:53:07 +12:00
Jason "Don" O'Conal 05095ec48d goobook: fix build on darwin 2014-05-05 11:45:03 +10:00
Cillian de Róiste e70602e12b #492 python-virtualenv: make modules of the python wrapper available 
Note: simply calling `virtualenv .` will not produce a ./bin/python
which can import e.g. sqlite3, using `virtualenv --python=python2.7`
will, if python2.7 is python27Full (the wrapped python). I'm not sure
if this is a bug or a feature.
 2014-04-18 18:08:49 +02:00
Domen Kožar 296dd89030 buildPythonPackage: don't return on shellHook 
Entering environment might not always be the desired effect.
 2014-04-07 00:43:50 +02:00
Peter Simons 078f064e9c Merge pull request #2036 from ambrop72/wxpython3 
Add wxPython-3.0 with OpenGL support.
 2014-03-26 11:10:15 +01:00
ambrop7@gmail.com 93d313c0ed Add wxPython-3.0 with OpenGL support. 2014-03-25 22:35:25 +01:00
Shea Levy a18eb2daa0 Fix tarball 2014-03-24 00:16:42 -04:00
Emery Hemingway e91daf327d electrum: initial expression 
Electrum is a Bitcoin thin-wallet.
https://electrum.org
 2014-03-23 11:22:57 -04:00
Jaka Hudoklin f7cdd1611b pythonPackages: distutils-cfg, allow to override config 2014-03-13 11:33:11 +01:00
Eelco Dolstra 1fe2a68224 quodlibet: Fix evaluation 
http://hydra.nixos.org/build/9400950
 2014-03-10 14:51:05 +01:00
Jaka Hudoklin 0558c87288 buildPythonPackage: add shell hook for instant development 2014-03-10 11:28:47 +01:00
Jaka Hudoklin f0f2125620 pythonPackages: auto add unzip to buildInputs if pkg has zip suffix 2014-03-08 23:29:15 +01:00
Domen Kozar 649e7d6fdb python wrap.sh: wrap pypy and python shebangs 2014-03-07 16:50:46 +01:00
Domen Kozar fedd018d93 fix pypy and pypyPackages 2014-03-07 14:34:06 +01:00
Peter Simons 02a475bf75 pylint: update from 0.26.0 to 0.28.0 2014-02-24 22:04:40 +01:00
Linquize afaee01ed3 pycairo: Update to 1.10.0 and support both python 2 and python 3 
Close #1802.
 2014-02-22 16:59:24 +01:00
Domen Kožar f1db57f1fe buildPythonPackage: fix more borken packages 2014-02-21 18:29:57 +01:00
Domen Kožar 567e67f05f bash doesn't allow comments between multiline statements 2014-02-20 01:19:16 +01:00
Domen Kožar fa98edf2b1 fix eval 2014-02-20 01:19:16 +01:00
Domen Kožar b1ffb9ede4 buildPythonPackage: Add --old-and-unmanageable flag to install command and add more docs. 
For explanation see inline comments.
 2014-02-20 01:19:16 +01:00
Domen Kožar c80feaf542 document setuptools monkeypatching and DETERMINISTIC_BUILD=1 2014-02-20 01:19:16 +01:00
Domen Kožar 21ada5b105 garden 2014-02-20 01:19:16 +01:00
Domen Kožar ab6865c3a4 distutils.cfg: name as others coding conventions for python packages 2014-02-20 01:19:15 +01:00
Domen Kožar 7cdab2c024 pythonPackages.setuptools: 2.0.2 -> 2.1 2014-02-20 01:19:15 +01:00
Domen Kožar fae6079a01 adopt rest of the packages that were failing with the buildPythonPackage changes 2014-02-20 01:19:15 +01:00
Domen Kožar 6adfd13dd4 adopt setuptools to new python infrastructure (also make sure we unzip setuptools while building) 2014-02-20 01:19:15 +01:00
Domen Kožar bf5d6fb9b1 Refactor buildPythonPackage to modularize building process. 
Before we used `easy_install` command to handle installation
in one shot, now this is split into two phases:

 - buildPhase: python setup.py build
 - installPhase: python setup.py install

Each of those commands have the ability to pass extra
parameters through buildPythonPackage parameters as
`setupPyInstallFlags` and `setupPyBuildFlags`.

Phases now correctly execute post/pre hooks.

In configurePhase we inject setuptools dependency before distutils
is imported to apply monkeypatching by setuptools that is needed
for special features to apply.

We don't have to reorder default phases anymore, as test
phase comes after build and that works.

I rewrote offineDistutils into distutils-cfg with a bit cleaner
syntax and ability to specify extraCfg to the config file.

Plone packages are failing and garbas said he will adopt them to
the new functions. The rest of the packages I fixed and these commits
shouldn't break any package (according to my testings) and they introduce
16 new jobs and fix 38 that were broken before.
 2014-02-20 01:19:15 +01:00
Domen Kožar 29b7f2e182 setuptools: remove obsolete patch 2014-02-20 01:19:15 +01:00
Domen Kožar 6cbc1d554f remove unused setuptools/site.nix 2014-02-20 01:19:14 +01:00
William A. Kennington III bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
Petr Rockai 63478d9590 Add fedpkg, koji &c. + their python dependencies. 2014-02-08 14:37:53 +01:00
Linquize 206b276fed Add pycangjie 
[Bjørn Forsman <bjorn.forsman@gmail.com>: expression cleanup]
 2014-02-02 14:54:40 +01:00
Oliver Charles 8ab1160079 pythonPackages.tarsnapper: New expression 2014-01-25 10:30:35 +00:00
Eelco Dolstra e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01: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
Song Wenwu 98d2f7ea45 sip: update to 4.15.4 and add python3 support 2014-01-11 20:07:28 +01:00
Vladimír Čunát 7cce1ff58b Merge pull request #1462 from ktosiek/pr/dfeet 
Add d-feet, a DBus debugger
 2014-01-07 05:54:43 -08:00
Sander van der Burg ad8974fc53 Disable test for setuptools on darwin, and add darwin to supported platforms for serf. This should make nodejs working on darwin again 2014-01-06 14:12:37 +01:00
Tomasz Kontusz 14eba9f3f9 Bump libwnck3 and pygobject3, and enable introspection 2014-01-05 23:50:25 +01:00
Domen Kožar c73f118af6 setuptools: 0.9.8 -> 2.0.2 2013-12-29 19:15:36 +01:00
Vladimír Čunát 50ac037864 Merge master into x-updates 2013-12-23 19:27:14 +01:00
Mathijs Kwik 5e2921df64 bsddb3: upgrade to 6.0.1 
should be backward compatible with all bdb 3 and 4 versions
 2013-12-23 10:25:16 +01:00
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