1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 16:11:58 +00:00
Commit graph

358 commits

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

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 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