summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* Revert "lib/licenses.nix: allow choosing license by its shortName"Vladimír Čunát2014-08-12
| | | | | There's no consensus to adopt that (yet). This reverts commit 229e5c41df8db960de9d57b247107b6239a60383.
* doc/meta.xml: fix github links, clarify licensing sectionVladimír Čunát2014-07-30
|
* xlsfonts, xfontsel: fix meta typoVladimír Čunát2014-07-30
|
* lib/licenses.nix: allow choosing license by its shortNameVladimír Čunát2014-07-30
| | | | | | Example: license = licenses."GPL-2.0+"; This comes with some performance cost during eval of licenses.nix, but that's probably negligible.
* lib/licenses.nix: improve sortednessVladimír Čunát2014-07-30
|
* lib/licenses.nix: convert to spdx.org shortnamesVladimír Čunát2014-07-30
| | | | | Done where possible, replacing links to point to spdx.org (probably stabler). Also make libtiff use its dedicated license.
* Merge #3400: kernel updatesVladimír Čunát2014-07-30
|\
| * kernel: 3.15.5 -> 3.15.7William A. Kennington III2014-07-29
| |
| * kernel: 3.14.12 -> 3.14.14William A. Kennington III2014-07-29
| |
| * kernel: 3.10.48 -> 3.10.50William A. Kennington III2014-07-29
| |
| * kernel: 3.4.98 -> 3.4.100William A. Kennington III2014-07-29
| |
* | vlc: minor updateVladimír Čunát2014-07-30
| |
* | Merge pull request #3357 from fignuts/df2014John Wiegley2014-07-29
|\ \ | | | | | | Add dwarf fortress 2014 (unstable) version
| * | bump version to 0.40.05Andrew Morsillo2014-07-28
| | |
| * | Add dwarf fortress 2014 (unstable) versionAndrew Morsillo2014-07-23
| | |
* | | Merge pull request #3372 from FlorentBecker/crawlJohn Wiegley2014-07-29
|\ \ \ | |_|/ |/| | Add dungeon crawl stone soup 0.14
| * | Add dungeon crawl stone soup 0.14Florent Becker2014-07-25
| | |
* | | Revert "use wrapper to set LUA_PATH variable"Bjørn Forsman2014-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 807cd4b4d40813ff1d801b0b17de3c421a465b1b, 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
* | | LambdaHack: disable test suite to fix buildPeter Simons2014-07-29
| | | | | | | | | | | | https://github.com/LambdaHack/LambdaHack/issues/57
* | | haskell-hlint: update to version 1.9.3Peter Simons2014-07-29
| | |
* | | haskell-yesod-auth: update to version 1.3.3Peter Simons2014-07-29
| | |
* | | haskell-wai-extra: update to version 3.0.1.1Peter Simons2014-07-29
| | |
* | | haskell-stm-containers: update to version 0.1.3Peter Simons2014-07-29
| | |
* | | haskell-profunctors: update to version 4.2Peter Simons2014-07-29
| | |
* | | haskell-filestore: update to version 0.6.0.3Peter Simons2014-07-29
| | |
* | | haskell-conduit-extra: update to version 1.1.3Peter Simons2014-07-29
| | |
* | | haskell-base-prelude: add version 0.1.3Peter Simons2014-07-29
| | |
* | | ardour: install a desktop fileBjørn Forsman2014-07-29
| | | | | | | | | | | | I based it on the desktop file from Arch Linux.
* | | nixos/tests/containers.nix: Don't pingEelco Dolstra2014-07-29
| | | | | | | | | | | | | | | | | | 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...
* | | erlang: Add manpages to all release packages.aszlig2014-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #3231 from madjar/masterDomen Kožar2014-07-29
|\ \ \ | | | | | | | | spotify: Updated to 0.9.11.26 and fixed expression
| * | | spotify: Fixed sha for i686Georges Dubus2014-07-29
|/ / /
* | | libzapojit: fix broken src urlEvgeny Egorochkin2014-07-29
| | |
* | | spotify: Update from 0.9.10.17 to 0.9.11.27 (x86_64)Rickard Nilsson2014-07-29
| | |
* | | Make the networkmanager group more discoverableDamien Cassou2014-07-29
| | | | | | | | | | | | | | | This change makes the manual present the networkmanager group at several places to make sure new users see it.
* | | python-wrapper: Fix handling of line breaks.aszlig2014-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | python-wrapper: Fix handling __future__ imports.aszlig2014-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | SimpleScreenRecorder 0.2.2 -> 0.3.0Cillian de Róiste2014-07-29
| | |
* | | initrd: Include filesystem support for /nix, /var etc.Eelco Dolstra2014-07-28
| | |
* | | Upgrade docker to 1.1.2 and add docker modulePaul Colomiets2014-07-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | freealut: Clean up expression and add meta.aszlig2014-07-28
| | | | | | | | | | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | toxic: Update to latest upstream Git master.aszlig2014-07-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | libtoxcore: Enable and fix up running test suite.aszlig2014-07-28
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | libtoxcore: Add libopus and libvpx to buildInputs.aszlig2014-07-28
| | | | | | | | | | | | | | | | | | | | | 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>
* | | libtoxcore: Update to latest Git master.aszlig2014-07-28
| | | | | | | | | | | | | | | | | | | | | The GitHub repository has changed the name to "toxcore". Also indented buildInputs/configureFlags a bit less messy. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | Partially revert 7a45996 some more.Peter Simons2014-07-28
| | | | | | | | | | | | | | | Removing more references to the non-existent license "stdenv.lib.licenses.perl5". Thanks to @FlashKorten for catching those.
* | | gnu: Fix (evaluation of the) call to forceSystem.Petr Rockai2014-07-28
| | |
* | | haskell-vty: update to version 5.1.3Peter Simons2014-07-28
| | |
* | | haskell-LambdaHack: update to version 0.2.14Peter Simons2014-07-28
| | |
* | | haskell-keter: update to version 1.3.3Peter Simons2014-07-28
| | |