mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity
23041 commits 312 branches 124 tags 6.5 GiB
Commit graph

212 commits

Author SHA1 Message Date
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 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