Commit Graph

445 Commits

Author SHA1 Message Date
aszlig
311aa5d8d9
python-wrapper: Handle strings at the beginning.
This should fix #7366 for now, but using the (IMHO) pragmatic approach
of extending the sed expression to recognize strings.

However, this approach is obviously not parsing the full AST, nor does
it wrap Python itself (as pointed out by @spwhitt in #7366) but tries to
match Python strings as best as possible without getting TOO unreadable.

We also use a little bit of Nix to help generating the SED expression,
because doing the whole quote matching block over and over again would
be quite repetitious and error-prone to change. The reason why I'm using
imap here is that we need to have unique labels to avoid jumping into
the wrong branch.

So the new expression is not only able to match continous regions of
triple-quoted strings, but also regions with only one quote character
(even with escaped inner quotes) and empty strings.

However, what it doesn't correctly recognize is something like this:

"string1" "string2" "multi
line
string"

Which is very unlikely that we'll find something like this in the wild.
Of course, we could handle it as well, but it would mean that we need to
substitute the current line into hold space until we're finished parsing
the strings, branch off to another label where we match multiline
strings of all sorts and swap hold/pattern space and finally print the
result. So to summarize: The SED expression would be 3 to 4 times bigger
than now and we gain very little from that.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-14 07:13:15 +02:00
Domen Kožar
c6512f7df3 buildPythonPackage: propagate setuptools 2015-04-12 21:15:36 -04:00
Joel Moberg
81465e8e56 graph-tool: add joelmo to maintainers 2015-04-01 18:16:15 +02:00
Joel Moberg
14106ba4f7 graph-tool: enable drawing and openmp for algorithms 2015-03-17 12:25:35 +01:00
Benjamin Staffin
02712cc3f1 Drop obsolete boto-1.9 patch
This has been unreferenced since commit
d52d71a04b from August 2014.
2015-03-07 14:06:08 -08:00
Benjamin Staffin
5113a065d7 boto: Apply patch needed to fix docker-registry
This makes docker-registry work when backed by S3. It's the same patch
applied in the docker upstream container image.

Backported from boto/boto#2932
2015-03-07 14:06:08 -08:00
Domen Kožar
0fd3db4ba1 fix #6548 2015-03-07 22:31:40 +01:00
Domen Kožar
0e0bc3ac86 gevent: update Python 2.7.9 compatibility patch 2015-03-07 19:30:00 +01:00
Domen Kožar
f4acbf30f2 Revert "Fix eval"
This reverts commit 6afc1907c8.

Not needed anymore after revert at
b653e3f661
2015-02-25 09:43:25 +01:00
Domen Kožar
9214859fd2 Revert "Mark many packages (mostly python) broken because of broken dependencies."
This reverts commit bf86758a42.

See 71a9aa10ca25f5659a657d8910e11f36c3439a36
2015-02-25 09:23:31 +01:00
Domen Kožar
67f9edc98e Revert "python-packages.nix: updated 'disabled' attributes to reduce the number of evaluation errors in http://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-errors"
This reverts commit a250e9b908.

See 71a9aa10ca25f5659a657d8910e11f36c3439a36
2015-02-25 09:23:31 +01:00
Domen Kožar
b653e3f661 Revert "python-generic: set meta.broken for disabled packages instead of raising an error during evaluation"
This reverts commit 79a5fec9c0.

meta.broken uses 'throw' under the hood so it can not improve the
current situation. Reverting to previous behaviour gives us correct
error message to the user indicating that interpreter is not supported.

Correcting Hydra output is out of scope of Python packaging.
2015-02-25 09:23:31 +01:00
Peter Simons
a250e9b908 python-packages.nix: updated 'disabled' attributes to reduce the number of evaluation errors in http://hydra.nixos.org/jobset/nixpkgs/trunk#tabs-errors 2015-02-24 15:23:45 +01:00
Bjørn Forsman
6afc1907c8 Fix eval
Fixes this:

$ nix-env -f . -qa \* --meta --xml --drv-path --show-trace >/dev/null
...
error: while querying the derivation named ‘pypy2.5-graph-tool-2.2.36’:
while evaluating the attribute ‘preConfigure’ of the derivation ‘pypy2.5-graph-tool-2.2.36’ at "/home/bfo/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix":5:3:
attribute ‘sitePackages’ missing, at "/home/bfo/nixpkgs/pkgs/development/python-modules/graph-tool/2.x.x.nix":22:54
2015-02-23 19:45:05 +01:00
Peter Simons
bf86758a42 Mark many packages (mostly python) broken because of broken dependencies. 2015-02-23 14:06:24 +01:00
Damien Cassou
8be35e6efe Merge pull request #6391 from DamienCassou/update-pylint-astroid
update pylint, astroid, six, and logilab-common
2015-02-17 11:08:37 +01:00
Damien Cassou
c9b4cb56ae update pylint, astroid, six, and logilab-common
pylint 1.4.0 -> 1.4.1
astroid 1.3.2 -> 1.3.4
six 1.8.0 -> 1.9.0
logilab-common 0.61.0 -> 0.63.2
2015-02-17 11:02:31 +01:00
Benjamin Staffin
fbeae50296 rbtools: update to 0.7.1
Change-Id: Ib41400507447564375a2ec61467b2ceb148e663c
2015-02-16 16:41:31 -08:00
Peter Simons
27b57469e8 python-generic: cosmetic 2015-02-13 10:37:46 +01:00
Peter Simons
79a5fec9c0 python-generic: set meta.broken for disabled packages instead of raising an error during evaluation
We have tons of evaluation errors on Hydra because it tries to build
known broken packages. Re-using meta.broken makes sure these packages
aren't evaluated in the first place.
2015-02-12 20:07:56 +01:00
Andrey Arapov
9f623a820d Adds a new package: cherrytree - A hierarchical note taking application
cherrytree - A hierarchical note taking application, featuring rich text
and syntax highlighting, storing data in a single xml or sqlite file.

This commit also adds PyGtkSourceView - a Python wrapper for the GtkSourceView widget library.

Official page http://www.giuspen.com/cherrytree
2015-01-31 02:17:00 +01:00
Joel Moberg
7b33a74235 Add graph-tool 2015-01-30 13:13:02 +01:00
Joachim Schiele
b8c2f466ba meld: bump to 3.12.3 (latest) version 2015-01-21 22:02:20 +01:00
lethalman
7cad64a13d Merge pull request #5856 from rycee/update/pyacoustid
Fix build of 'pyacoustid' under Python 3.
2015-01-21 10:54:27 +01:00
Domen Kožar
5cd76cd85e gevent: fix ssl patch 2015-01-20 22:40:58 +01:00
Robert Helgesson
f4bcecbda4 Fix build of 'pyacoustid' under Python 3. 2015-01-19 18:42:23 +01:00
Domen Kožar
a4e3393050 matplotlib: be consistent 2015-01-17 15:24:54 +01:00
Domen Kožar
0f82c6bdb2 matplotlib: add optional gtk3 backend, fixes #4500 2015-01-17 15:11:24 +01:00
Robert Helgesson
0c27d37495 Remove some matplotlib optional backends.
The removed ones are not certain to work at the moment.
2015-01-17 14:24:49 +01:00
Robert Helgesson
c8d0d91db1 Add optional backends to matplotlib. 2015-01-17 14:24:49 +01:00
Domen Kožar
9a33fbb52d python: don't propagate installed packages into userenv, refs #4949
Propagation is not needed anymore, as we have more powerful apis today
than this dirty hack. See nix-shell tool and python.buildEnv function
in nixpkgs manual.
2015-01-17 14:19:29 +01:00
Domen Kožar
c611f5837c fix gevent/eventlet on python 2.7.9, fixes #5782 2015-01-17 14:15:18 +01:00
John Wiegley
783e27e32a pycrypto: preConfigure patch ups 2015-01-03 07:53:08 -05:00
Vincent Laporte
78ea82f11c pyqt4: update from 4.10.2 to 4.11.3 2014-12-24 13:59:57 +01:00
Vincent Laporte
81a2b58c39 nixpkgs: remove redundant attribute sip
Because:

 1. It is a mere alias of `pythonPackages.sip`
 2. It is usually not needed since propagated by `pyqt4`
 3. It makes it easy to have a packages depend on two different versions
 of sip
2014-12-23 19:37:21 +01:00
Vincent Laporte
dc8c05de63 sip-4.16: update from 4.16.1 to 4.16.4 2014-12-22 23:36:55 +01:00
Damien Cassou
8967e88438 Update pylint and astroid 2014-12-16 16:54:41 +01:00
Domen Kožar
d3ed0ab32b PyQt: fix build 2014-12-09 13:23:13 +01:00
Domen Kožar
e8c4ef278c Merge pull request #5007 from nbp/bugwarrior
Add Bugwarrior and its dependencies.
2014-12-01 22:20:17 +01:00
Domen Kožar
9218987008 setuptools: 5.8 -> 7.0 2014-11-30 20:42:06 +01:00
Nicolas B. Pierron
43bbfae9e5 Add python-taskw 0.8.6. 2014-11-30 16:48:51 +01:00
Nicolas B. Pierron
e778d5dcfb Add python-bugzilla 1.1.0. 2014-11-30 16:48:51 +01:00
Domen Kožar
9047f389bf pygame: fix build, add all deps, use buildPythonPackage 2014-11-26 21:50:58 +01:00
Domen Kožar
8236ca5d70 properly package pyopenssl 2014-11-19 19:41:44 +01:00
Mateusz Kowalczyk
88ea3e8c48 bsddb3: update from 6.0.1 to 6.1.0 2014-11-17 18:07:17 +00:00
Michael Raskin
a7c8d00b27 Merge pull request #4857 from abbradar/cups2
[WIP] Improve printing experience and update related packages
2014-11-15 15:18:35 +03:00
Nikolay Amiantov
a3fc8ea8db pycups: update package 2014-11-14 16:30:53 +03:00
Domen Kožar
ab423e6367 buildPythonPackage: add python to propagatedBuildInputs
Doing:

$ nix-shell -p pythonPackage.pyramid

now also sets $PYTHONPATH. Previously you'd have to do:

$ nix-shell -p pythonPackage.pyramid python
2014-11-13 21:04:13 +01:00
Robert Helgesson
442b097b0d Add 'pycdio', a Python wrapper for libcdio. 2014-11-07 21:26:53 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00