Commit Graph

46227 Commits

Author SHA1 Message Date
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
Cillian de Róiste
6259669355 SimpleScreenRecorder 0.2.2 -> 0.3.0 2014-07-29 00:15:53 +02:00
Eelco Dolstra
cb7b871bd6 initrd: Include filesystem support for /nix, /var etc. 2014-07-28 22:31:18 +02:00
Paul Colomiets
9bc1676e5a Upgrade docker to 1.1.2 and add docker module
This version of module has disabled socketActivation, because until
nixos upgrade systemd to at least 214, systemd does not support
SocketGroup. So socket is created with "root" group when
socketActivation enabled. Should be fixed as soon as systemd upgraded.

Includes changes from #3015 and supersedes #3028
2014-07-28 21:45:49 +02:00
aszlig
88a8b004c6
freealut: Clean up expression and add meta.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 21:19:08 +02:00
aszlig
9edfad2717
toxic: Update to latest upstream Git master.
Unfortunately they've changed their build system to be makefile-only and
they don't seem to include test cases in the CLI anymore, so we needed
to adapt accordingly. Also added freealut and openal to the buildInputs,
in order to allow audio support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 20:53:11 +02:00
aszlig
e542ff7288
libtoxcore: Enable and fix up running test suite.
We not only require libcheck but also needed to disable a few tests,
without providing the former, test cases were signalled as being run
successfully but weren't actually run.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 20:53:11 +02:00
aszlig
40548fce62
libtoxcore: Add libopus and libvpx to buildInputs.
Those are necessary to do audio/video calls, which I guess is the whole
point of the Tox project.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 20:53:10 +02:00
aszlig
2aa89519a0
libtoxcore: Update to latest Git master.
The GitHub repository has changed the name to "toxcore".
Also indented buildInputs/configureFlags a bit less messy.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 20:53:10 +02:00
Peter Simons
5cc55e9523 Partially revert 7a45996 some more.
Removing more references to the non-existent license "stdenv.lib.licenses.perl5".
Thanks to @FlashKorten for catching those.
2014-07-28 20:52:47 +02:00
Petr Rockai
559f423417 gnu: Fix (evaluation of the) call to forceSystem. 2014-07-28 20:46:32 +02:00
Peter Simons
9d56d25673 haskell-vty: update to version 5.1.3 2014-07-28 20:32:59 +02:00
Peter Simons
02bd934738 haskell-LambdaHack: update to version 0.2.14 2014-07-28 20:32:59 +02:00
Peter Simons
86dc30daa6 haskell-keter: update to version 1.3.3 2014-07-28 20:32:59 +02:00
Peter Simons
f74d211818 haskell-yesod-routes: update to version 1.2.0.7 2014-07-28 20:32:59 +02:00
Peter Simons
4886d942b9 haskell-yesod-form: update to version 1.3.13 2014-07-28 20:32:58 +02:00
Peter Simons
510a784242 haskell-yesod-core: update to version 1.2.18 2014-07-28 20:32:58 +02:00
Peter Simons
9ded0e831e haskell-yesod-bin: update to version 1.2.12 2014-07-28 20:32:58 +02:00
Peter Simons
ad0bd2a795 haskell-yesod-auth: update to version 1.3.2 2014-07-28 20:32:58 +02:00
Peter Simons
93e75667cf haskell-wai-logger: update to version 2.1.2 2014-07-28 20:32:58 +02:00
Peter Simons
27b7ae9b62 haskell-vector-algorithms: update to version 0.6.0.3 2014-07-28 20:32:58 +02:00
Peter Simons
df253270e4 haskell-tzdata: update to version 0.1.20140612.0 2014-07-28 20:32:55 +02:00
Peter Simons
2d604d3416 haskell-tz: update to version 0.0.0.8 2014-07-28 20:32:55 +02:00
Peter Simons
63005f734f haskell-trifecta: update to version 1.5.1 2014-07-28 20:32:55 +02:00
Peter Simons
e3e77ec115 haskell-taggy: update to version 0.1.2 2014-07-28 20:32:55 +02:00
Peter Simons
55b8994ac7 haskell-statistics: update to version 0.13.1.1 2014-07-28 20:32:55 +02:00
Peter Simons
69a1a8a435 haskell-sparse: update to version 0.9.1 2014-07-28 20:32:55 +02:00
Peter Simons
5d7bd07003 haskell-shakespeare: update to version 2.0.1.1 2014-07-28 20:32:55 +02:00
Peter Simons
8f625b50a3 haskell-semigroups: update to version 0.15.2 2014-07-28 20:32:54 +02:00
Peter Simons
cb0e5f8e87 haskell-semigroupoids: update to version 4.0.4 2014-07-28 20:32:54 +02:00
Peter Simons
4d54be786b haskell-repa: update to version 3.3.1.2 2014-07-28 20:32:54 +02:00
Peter Simons
f33521699c haskell-repa-io: update to version 3.3.1.2 2014-07-28 20:32:54 +02:00
Peter Simons
a8b5bd5fe6 haskell-repa-examples: update to version 3.3.1.1 2014-07-28 20:32:54 +02:00
Peter Simons
6dfc5dc01e haskell-repa-algorithms: update to version 3.3.1.2 2014-07-28 20:32:54 +02:00
Peter Simons
2074cd3850 haskell-profunctors: update to version 4.1 2014-07-28 20:32:54 +02:00
Peter Simons
6db5defffc haskell-mono-traversable: update to version 0.6.1 2014-07-28 20:32:54 +02:00
Peter Simons
a80f691ea6 haskell-mongoDB: update to version 2.0.3 2014-07-28 20:32:54 +02:00
Peter Simons
39b1199265 haskell-lifted-async: update to version 0.2.0.1 2014-07-28 20:32:54 +02:00
Peter Simons
4fb51b17d3 haskell-lens: update to version 4.3.2 2014-07-28 20:32:54 +02:00
Peter Simons
8ba0c3eb04 haskell-kan-extensions: update to version 4.1 2014-07-28 20:32:54 +02:00
Peter Simons
653ed04b03 haskell-hslua: update to version 0.3.13 2014-07-28 20:32:54 +02:00
Peter Simons
9e7dd8705e haskell-hp2any-graph: update to version 0.5.4.2 2014-07-28 20:32:53 +02:00
Peter Simons
595cfaadb7 haskell-haskell-token-utils: update to version 0.0.0.5 2014-07-28 20:32:53 +02:00
Peter Simons
cd3c2b7ed7 haskell-equivalence: update to version 0.2.5 2014-07-28 20:32:53 +02:00
Peter Simons
15deeec1bc haskell-dns: update to version 1.4.1 2014-07-28 20:32:53 +02:00
Peter Simons
5c22263945 haskell-contravariant: update to version 1.1 2014-07-28 20:32:53 +02:00
Peter Simons
add9078981 haskell-conduit-combinators: update to version 0.2.8.2 2014-07-28 20:32:53 +02:00
Peter Simons
9fab47de52 haskell-comonad: update to version 4.2.2 2014-07-28 20:32:53 +02:00
Peter Simons
b614d0ad7b haskell-cmdargs: update to version 0.10.9 2014-07-28 20:32:53 +02:00
Peter Simons
5fde244c07 haskell-classy-prelude: update to version 0.9.3 2014-07-28 20:32:53 +02:00