Commit Graph

46262 Commits

Author SHA1 Message Date
Vladimír Čunát
5cc2a142b0 doc/meta.xml: fix github links, clarify licensing section 2014-07-30 20:07:54 +02:00
Vladimír Čunát
cb8f8bdbff xlsfonts, xfontsel: fix meta typo 2014-07-30 19:32:53 +02:00
Vladimír Čunát
229e5c41df lib/licenses.nix: allow choosing license by its shortName
Example: license = licenses."GPL-2.0+";
This comes with some performance cost during eval of licenses.nix,
but that's probably negligible.
2014-07-30 19:22:09 +02:00
Vladimír Čunát
0f2101215d lib/licenses.nix: improve sortedness 2014-07-30 18:16:36 +02:00
Vladimír Čunát
32c237d782 lib/licenses.nix: convert to spdx.org shortnames
Done where possible, replacing links to point to spdx.org (probably stabler).
Also make libtiff use its dedicated license.
2014-07-30 18:16:09 +02:00
Vladimír Čunát
33e4a7f623 Merge #3400: kernel updates 2014-07-30 09:34:05 +02:00
Vladimír Čunát
be07584397 vlc: minor update 2014-07-30 09:31:24 +02:00
John Wiegley
b90e56a53c Merge pull request #3357 from fignuts/df2014
Add dwarf fortress 2014 (unstable) version
2014-07-29 13:20:35 -05:00
John Wiegley
867d3fbf47 Merge pull request #3372 from FlorentBecker/crawl
Add dungeon crawl stone soup 0.14
2014-07-29 13:20:18 -05:00
William A. Kennington III
ff747dd24f kernel: 3.15.5 -> 3.15.7 2014-07-29 13:17:11 -05:00
William A. Kennington III
2494e2bb09 kernel: 3.14.12 -> 3.14.14 2014-07-29 13:15:42 -05:00
William A. Kennington III
dd9a5aeade kernel: 3.10.48 -> 3.10.50 2014-07-29 13:13:38 -05:00
William A. Kennington III
47d50bf684 kernel: 3.4.98 -> 3.4.100 2014-07-29 13:08:37 -05:00
Bjørn Forsman
559eaeb2d2 Revert "use wrapper to set LUA_PATH variable"
This reverts commit 807cd4b4d4, as it
broke the 'awesome' package. It was also an incomplete change, only
modifying lua-5.1 and none of the other lua versions.

A better approach, if wanting lua to pick up external modules, would be
to loop over $NIX_PROFILES. $NIX_PROFILES is unset in build
environments, so it should be safe.

Conflicts:
	pkgs/development/interpreters/lua-5/5.1.nix
2014-07-29 18:42:20 +02:00
Peter Simons
fc81ff49d2 LambdaHack: disable test suite to fix build
https://github.com/LambdaHack/LambdaHack/issues/57
2014-07-29 18:39:36 +02:00
Peter Simons
90939a0482 haskell-hlint: update to version 1.9.3 2014-07-29 18:39:36 +02:00
Peter Simons
877585bf38 haskell-yesod-auth: update to version 1.3.3 2014-07-29 18:39:35 +02:00
Peter Simons
3b07c45fb7 haskell-wai-extra: update to version 3.0.1.1 2014-07-29 18:39:35 +02:00
Peter Simons
5fd8cff160 haskell-stm-containers: update to version 0.1.3 2014-07-29 18:39:35 +02:00
Peter Simons
5738b59400 haskell-profunctors: update to version 4.2 2014-07-29 18:39:35 +02:00
Peter Simons
f900746689 haskell-filestore: update to version 0.6.0.3 2014-07-29 18:39:35 +02:00
Peter Simons
3e551e05c6 haskell-conduit-extra: update to version 1.1.3 2014-07-29 18:39:34 +02:00
Peter Simons
d711c60c3d haskell-base-prelude: add version 0.1.3 2014-07-29 18:39:34 +02:00
Bjørn Forsman
18b27cf2e3 ardour: install a desktop file
I based it on the desktop file from Arch Linux.
2014-07-29 18:31:21 +02:00
Eelco Dolstra
19fc92a8ed nixos/tests/containers.nix: Don't ping
This randomly fails with "Destination Host Unreachable". That
shouldn't happen, since all interfaces/routes should be up after
"nixos-container start" returns. Need more investigation...
2014-07-29 15:34:22 +02:00
aszlig
ec65a1e391
erlang: Add manpages to all release packages.
This puts manpages into "$out/lib/erlang/man" and also symlinks them
into "$out/share/man" with an "erl" suffix (similar to how Debian is
handling this) so those manpages are unlikely to collide with any other
manpages, like for example inet(3).

Closes #3396.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Moritz Ulrich <moritz@tarn-vedra.de>
2014-07-29 15:26:13 +02:00
Domen Kožar
84e8983027 Merge pull request #3231 from madjar/master
spotify: Updated to 0.9.11.26 and fixed expression
2014-07-29 14:07:54 +02:00
Georges Dubus
938cd64a6a spotify: Fixed sha for i686 2014-07-29 14:01:39 +02:00
Evgeny Egorochkin
f7ef36428d libzapojit: fix broken src url 2014-07-29 13:42:45 +03:00
Rickard Nilsson
2b8b29c3dd spotify: Update from 0.9.10.17 to 0.9.11.27 (x86_64) 2014-07-29 11:56:29 +02:00
Damien Cassou
355a46ec5d Make the networkmanager group more discoverable
This change makes the manual present the networkmanager group at several
places to make sure new users see it.
2014-07-29 09:14:57 +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
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