Commit Graph

439 Commits

Author SHA1 Message Date
Rok Garbas
602f7e5aa4 python: collision in names when developing 2 and more python packages with nix
when you run nix-shell 2 times at the same time of project (but different
branches) you get collision in names inside /tmp folder. i solved this by
hashing current path of developing folder and using that as indentifier while
still keeping name at the end.

diff --git a/pkgs/development/python-modules/generic/default.nix
b/pkgs/development/python-modules/generic/default.nix index 4c9c53a..6ec7934
100644 --- a/pkgs/development/python-modules/generic/default.nix +++
b/pkgs/development/python-modules/generic/default.nix @@ -161,11 +161,12 @@ if
disabled then throw "${name} not supported for interpreter ${python.executabl

   shellHook = attrs.shellHook or ''
     if test -e setup.py; then
-       mkdir -p /tmp/$name/lib/${python.libPrefix}/site-packages
+       tmp_path=/tmp/`pwd | md5sum | cut -f 1 -d " "`-$name
+       mkdir -p $tmp_path/lib/${python.libPrefix}/site-packages
        ${preShellHook}
-       export PATH="/tmp/$name/bin:$PATH"
-       export PYTHONPATH="/tmp/$name/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
-       ${python}/bin/${python.executable} setup.py develop --prefix /tmp/$name
+       export PATH="$tmp_path/bin:$PATH"
+       export PYTHONPATH="$tmp_path/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
+       ${python}/bin/${python.executable} setup.py develop --prefix $tmp_path
        ${postShellHook}
     fi
   '';
2014-09-19 14:23:45 +02:00
Domen Kožar
cee221bc84 setuptools: 2.1 -> 5.8 2014-09-18 14:03:16 +02:00
Domen Kožar
2632afa131 pypy: handle unsupported packages 2014-09-12 00:26:50 +02:00
Domen Kožar
33ce850b82 fix a bunch of packages with lua5_1 2014-09-10 17:24:56 +02:00
Domen Kožar
c6fa90f322 rbtools: 0.4.1 -> 0.6.1 2014-09-10 15:41:07 +02:00
Andreas Herrmann
970f51ac0a mpi4py: Disable for Python3 and PyPy
Builds for Python3 and PyPy are failing at the moment [1-3]. Therefore, they
are disabled.

[1]: https://github.com/NixOS/nixpkgs/pull/3938#issuecomment-54750065
[2]: http://hydra.nixos.org/build/13993137/nixlog/1/raw
[3]: http://hydra.nixos.org/build/13873028/log/raw
2014-09-07 19:44:08 +02:00
Domen Kožar
0418d8299d disable a bunch of python packages on pypy 2014-09-06 22:25:00 +02:00
Andreas Herrmann
4cae816420 h5py: Change description 2014-09-04 18:48:08 +02:00
Andreas Herrmann
3a38a9b127 mpi4py: Change description 2014-09-04 18:47:57 +02:00
Andreas Herrmann
9ac9a06f13 h5py: Adhere to package description convention 2014-09-03 21:32:42 +02:00
Andreas Herrmann
f50c5602e9 mpi4py: Adhere to package description convention 2014-09-03 21:32:36 +02:00
Andreas Herrmann
728793ef0b h5py: New package, version 2.3.1 2014-09-02 13:56:54 +02:00
Andreas Herrmann
1e786087e4 mpi4py: New package, version 1.3.1 2014-09-02 13:56:47 +02:00
Domen Kožar
7e91d1c8a1 Revert "mpi4py: New package, version 1.3.1"
This reverts commit 63c062947eb765e4a02bc892e1891da7057fdfec.

Doesn't build.
2014-08-31 15:12:34 +02:00
Domen Kožar
b63496ba6b Revert "h5py: New package, version 2.3.1"
This reverts commit 3c6afb34967a241e2c2e106cb02bad55b5389b94.

Doesn't build.
2014-08-31 15:12:17 +02:00
Michael Raskin
0078bc5d8f Merge pull request #3316 from aherrmann/pr_mpi
MPI support for HDF5 and SGE support for OpenMPI
2014-08-29 01:22:02 +04:00
Domen Kožar
62345fee55 python: provide better message if python interpreter is not supported 2014-08-27 15:53:15 +02:00
Domen Kožar
0a1d52711b pygtk: disable on py3k 2014-08-26 14:41:44 +02:00
Domen Kožar
6417cf14b1 python3Packages.BTrees: fix build on i686-linux 2014-08-26 10:47:22 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Domen Kožar
ecb77869d2 pythonPackages.pil: put it inside python-packages.nix and disable on py3k 2014-08-24 16:55:15 +02:00
Domen Kožar
47673e43c9 buildPythonPackage: introduce "disabled" argument
Useful to disable the package for specific python versions.

Typically usage: disable = isPy3k;
2014-08-24 16:02:57 +02:00
Domen Kožar
9cbc216576 pypyPackages.pycrypto: make it work 2014-08-23 19:18:27 +02:00
Domen Kožar
f1a1c89f50 PIL: use python executable names 2014-08-23 19:18:27 +02:00
ambrop7@gmail.com
8516495560 python-pyuv: new package
Pyuv is a Python interface to libuv, a cross-platform asychronous I/O
library.

The setup.py is tweaked to that the system version of libuv is used,
instead of tying to fetch one with git.

[Bjørn: change commit message]
2014-08-22 21:57:14 +02:00
Vladimír Čunát
566058b477 Merge #3152: add pyqt5 2014-08-12 20:33:34 +02:00
Lluís Batlle i Rossell
5e35fef0eb freecad: updating to 0.14
I had to update all the pyside programs, or freecad failed to build.  I picked
the versions advertised in http://qt-project.org/wiki/PySideDownloads . The
rest I took for github latest releases.
2014-08-01 16:56:27 +02:00
aszlig
21a2f99dd3
python-wrapper: Fix handling of line breaks.
Not really critical for anything we have in <nixpkgs> I guess, but
skipping lines three times really was a workaround and we're better off
just appending the lines ending with backslash to the pattern space so
we can accumulate all the crap until the last line of crap (crap, that
is "broken lines").

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-29 06:53:17 +02:00
aszlig
ff15c31c37
python-wrapper: Fix handling __future__ imports.
The bazaar package is still broken even with 5f01cc7, because __future__
imports need to be the first imports before anything else. So this time
I'm going to make the sed expression with explicit branching so we can
properly match all the occasions we want to skip and insert the line
modifying sys.argv[0] only _once_ and leave the command block after
that one substitution. So no ugly swaps between hold and pattern space.

The label which is resonsible for not escaping the command block is "r"
and we jump to it as long as we need to skip something from the start of
the file.

While at it, I'm not only skipping every line with __future__ in it but
also backslashes at the end of the line, so for example:

```python
from __future__ import shiny_feature1, \
                       shiny_feature2, \
                       shiny_feature3
```

... will now be properly skipped as well.

Tested against bazaar and nixops.

Thanks to @edolstra for reporting this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-29 06:40:39 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
aszlig
5f01cc70d3
python-wrapper: Fix fixup for wrapped argv[0].
Fixes issues introduced by 24ef871e6a1c858af3f9984a5b526c83b24520ed.

The problem here is that "import sys; sys.argv[0] = ..." is just
appended after the first "#!", which in turn breaks things such as
encoding specifications. A second problem - although not very common -
is when there's another #! within the script.

This should take care of both cases.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 04:18:21 +02:00
Christian Theune
24ef871e6a python: fix argv[0] for wrapped console_scripts.
Previously programs would see '.<program>-wrapped' as their program name. This is a workaround
but should be reasonably safe and reliable.
2014-07-27 13:23:15 +02:00
Sven Keidel
4ef371e1f6 added platform meta information to gpodder 2014-07-22 09:39:06 +02:00
Sven Keidel
ee9ffde1cb added metainformation for gpodder and mygpoclient 2014-07-21 21:41:27 +02:00
Sven Keidel
eeeed00950 added gpodder package 2014-07-20 21:14:00 +02:00
Andreas Herrmann
3c6afb3496 h5py: New package, version 2.3.1
A pythonic interface to the hdf5 library. It also supports parallel hdf5.
2014-07-18 22:41:56 +02:00
Andreas Herrmann
63c062947e mpi4py: New package, version 1.3.1
Python wrapper for the message passing interface standard.

Currently building without mpe, or vampir-trace support.
2014-07-18 22:41:56 +02:00
宋文武
f44c056490 add pyqt5 2014-07-07 14:23:55 +08:00
宋文武
05c0bb929e add sip-4.16.1 2014-07-07 14:20:15 +08:00
Andreas Herrmann
ddfdd85171 tables: Define license 2014-07-05 21:41:04 +02:00
Florian Friesdorf
ba654b9368 Merge pull request #3056 from aherrmann/pr_tables
Python module tables
2014-06-23 22:58:04 +02:00
Bjørn Forsman
686d847ee2 4suite: mark as broken
None of the tools installed to bin/ work. They all throw an exception
similar to this:
  ImportError: No module named Ft.Xml.XPath._4xpath
2014-06-22 20:52:52 +02:00
Andreas Herrmann
52762ed416 tables: add new package, version 3.1.1
From the project page [1]:
> PyTables is a package for managing hierarchical datasets and designed to
> efficiently and easily cope with extremely large amounts of data.

It offers read/write access to hdf5 archives through a hierarchical interface.

I am adding it, because pandas depends on tables for hdf5 read/write
functionality.

Note: The name is a bit of an issue. The project is called pytables, whereas
the python module is simply called tables. I chose to name the nix-expression
tables for consistency with the source-tarball and the module name.

[1]: http://www.pytables.org/moin
2014-06-22 20:05:21 +02:00
Domen Kožar
0d71d2b631 fixes #2926 2014-06-15 16:05:18 +02:00
Vladimír Čunát
e1775895a6 Merge #2711: add ansible-1.6.1
Conflicts (trivial):
	lib/maintainers.nix
2014-06-11 20:29:55 +02:00
Michael Raskin
cc13182795 Create a PIL symlink when installing PIL so the recommended way of importing PIL.something works 2014-06-11 10:01:15 +04:00
Vladimír Čunát
97006eb5ed Merge #2638: fix weechat build on darwin
Conflicts (trivial):
	pkgs/development/python-modules/pycrypto/default.nix
2014-06-09 19:37:06 +02:00
Jussi Maki
75cb485718 ansible: conventions, fix module execution 2014-05-21 14:46:37 +02:00
Vladimír Čunát
82ad01e899 pygobject3: update 3.10.2 -> 3.12.1 2014-05-20 13:37:09 +02:00
Vladimír Čunát
e470391988 pycairo: fix for python-3.4 by LFS patches
Fixes #2693.
2014-05-20 12:44:09 +02:00
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