3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1555 commits

Author SHA1 Message Date
William A. Kennington III 00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Arseniy Seroka a8f17b376e Merge pull request #7642 from leenaars/master
Nixpkg updated with new release of Blink (1.3.0, released Apr 29th 2015)
2015-05-01 03:50:48 +03:00
Rob Vermaas 33984cfeee Add logentries agent 1.4.13 2015-04-30 16:44:45 +00:00
Joachim Fasting bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
Michiel Leenaars 85c0aac675 New release of Blink 2015-04-30 09:49:45 +02:00
Thomas Tuegel 1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging 2015-04-29 11:33:28 -05:00
Hendrik Bunke 27ea35b481 pythonPackages: fixed and updated goobook
goobook didn't work because dependency package 'six' has been in buildInputs
but should be in propagatedBuildInputs.

Also: updated goobook to 1.6
2015-04-28 12:24:28 +02:00
Pascal Wittmann f99d5cf2fc Fixed some descriptions 2015-04-28 10:55:20 +02:00
Pascal Wittmann ad90aaf287 Merge pull request #7579 from ip1981/mwlib
Adding mwlib
2015-04-27 10:25:25 +02:00
Edward Tjörnhammar 2a8b3c724b Merge pull request #7521 from hbunke/hb_geeknote
python-packages: added geeknote with dependencies
2015-04-27 00:20:12 +02:00
Vladimír Čunát 30f31c9afc Merge 'master' into staging
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Igor Pashev 00c3434a7e Added mwlib 2015-04-26 20:32:13 +00:00
Hendrik Bunke 60aa7bec64 python-packages: added geeknote and dependencies
packages: geeknote, thrift, markdown2, evernote
2015-04-26 14:28:01 +02:00
Jaka Hudoklin 8599cfdad4 Merge pull request #7552 from offlinehacker/pkgs/python-packages/docker-compose
fig: switch to docker-compose
2015-04-25 16:23:00 +02:00
Jaka Hudoklin 3e480fde93 fig: switch to docker-compose 2015-04-25 15:11:19 +02:00
William A. Kennington III 49967a7b3a sphinx: 1.2.3 -> 1.3.1 2015-04-22 12:35:21 -07:00
William A. Kennington III 6a031c8aa7 snowballstemmer: Add derivation 2015-04-22 12:35:21 -07:00
William A. Kennington III d144b28996 PyStemmer: Add derivation 2015-04-22 12:35:21 -07:00
William A. Kennington III 18e91d3614 alabaster: Add derivation 2015-04-22 12:35:21 -07:00
William A. Kennington III 132c01761e docutils: 0.11 -> 0.12 2015-04-22 12:35:21 -07:00
Rok Garbas 052b079c02 Revert "pythonPackages.pyenchant: point to enchant lib via PYENCHANT_LIBRARY_PATH"
This reverts commit 314d146c8c.
2015-04-21 20:14:59 +02:00
Rok Garbas 314d146c8c pythonPackages.pyenchant: point to enchant lib via PYENCHANT_LIBRARY_PATH 2015-04-21 09:42:55 +02:00
Arseniy Seroka 63d4512d33 Merge pull request #7455 from spwhitt/pil
pil, pillow: Patch out Darwin impurities
2015-04-19 04:30:18 +03:00
Spencer Whitt edf9bcdbab pil, pillow: Patch out Darwin impurities 2015-04-18 19:58:02 -04:00
Arseniy Seroka 594ce7bc5d Merge pull request #7435 from anderspapitto/master
add gmusicapi python package
2015-04-18 17:36:25 +03:00
Anders Papitto c11c36daaa add gmusicapi python package
as well as several dependencies. Tested with a personal project that
relies on gmusicapi
2015-04-17 18:17:50 -07:00
Domen Kožar a914bd8311 django: add 1.8 2015-04-16 14:10:19 -04:00
Domen Kožar c1e716bfb9 django: don't wrap template scripts, fixes #3134 2015-04-16 14:10:19 -04:00
Domen Kožar 0206245aba Revert "Fix buildPythonPackage overriding."
This reverts commit 6a1de6d4a7.

It broke eval
2015-04-14 15:02:49 -04:00
Tom Hunger 6a1de6d4a7 Fix buildPythonPackage overriding.
makeOverridable takes a function and an argument, the parenthesis
caused there to be only one argument which works but cannot
be overridden.
2015-04-14 17:52:36 +01:00
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
koral 94af1ba4d7 glances: 2.1 -> 2.3 2015-04-12 20:59:04 +00:00
Austin Seipp a7118b5e6a nixpkgs: python34Packages.rainbowstream 1.1.6 -> 1.2.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 10:28:36 -05:00
Austin Seipp c14689c328 nixpkgs: python34Packages.arrow 0.4.4 -> 0.5.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 10:28:36 -05:00
Austin Seipp 0093d7a9ea nixpkgs: pythonPackages.obfsproxy 0.2.12 -> 0.2.13
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 10:28:36 -05:00
Bjørn Forsman 48b5ad912f python-pelican: add missing 'markupsafe' dependency
Needed to be able to run 'make serve' in a pelican directory, else this
happens:

  $ make serve
  cd /home/bfo/pelican-test/output && python -m pelican.server
  /run/current-system/sw/bin/python: No module named markupsafe
  make: *** [serve] Error 1
2015-04-12 17:18:13 +02:00
aszlig 54f58ee991
python-mccabe: Fix build due to missing tests.
Regression introduced by 56a6f22d7f.

I'm temporarily pulling in test_mccabe.py, as suggested by someone at
flintwork/mccabe#31, which for now should fix the build (and the tests
of course as well).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-12 06:50:34 +02:00
Rok Garbas 56a6f22d7f pythonPackages: updates for many packages
* deform -> 2.0a2
* peppercorn -> 0.5
* pyramid -> 1.5.2
* pyramid_tm -> 0.10
* zope_deprecation -> 4.1.2
* venusian -> 1.0
* flake8 -> 2.3.0
* mccabe -> 0.3
* pg8000 -> 1.10.1
* turses -> 0.2.23
* urwid -> 1.3.0
* waitress -> 0.8.9
* translationstring -> 1.3
2015-04-11 17:00:07 +02:00
Bjørn Forsman 2c6f9b0c62 python-robotframework: update 2.8.6 -> 2.8.7
Release notes:
https://github.com/robotframework/robotframework/releases/tag/2.8.7
2015-04-11 14:18:19 +02:00
Thomas Tuegel 88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Charles Strahan 8757cc4eb0 awscli: update to 1.7.21 2015-04-09 19:24:46 -04:00
Arseniy Seroka 2425f27b17 Merge pull request #7280 from auntieNeo/blink
Bumped blink version to 1.2.2
2015-04-09 05:20:19 +03:00
Jonathan Glines 2b949cfd46 Bumped blink version to 1.2.2 2015-04-08 17:01:37 -06:00
Domen Kožar 158d444f78 Merge pull request #7262 from desiderius/colander-1.0
python-packages: update colander-1.0b to 1.0
2015-04-08 17:42:45 +02:00
John Wiegley eda06c4768 Drop reference to unknown attribute "unknown" 2015-04-07 10:44:21 -05:00
Sander van der Burg ee6406d234 python-dicttoxml: add package 2015-04-07 15:32:07 +00:00
desiderius fca7bee0c1 python-packages: update colander-1.0b to 1.0 2015-04-07 15:21:29 +02:00
Erik Timan e5989ee6e3 python-packages: add missing deps to azure 2015-04-07 09:52:29 +00:00
Erik Timan db6de11341 python-packages: azure 0.9.0 -> 0.10.0
Also adds maintainer section.
2015-04-07 09:30:46 +00:00
Domen Kožar 64c0e6b7fa Merge pull request #7219 from rzetterberg/development
Removes python 2.7 block in favor of "disabled"
2015-04-07 06:44:44 +02:00