Vladimír Čunát 6295a3ca36 Merge recent master into x-updates ...

Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix

2014-08-02 05:08:07 +02:00

..

arduino

…

compilers

Merge recent master into x-updates

2014-08-02 05:08:07 +02:00

eclipse

…

guile-modules

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

interpreters

Merge recent master into x-updates

2014-08-02 05:08:07 +02:00

libraries

Merge recent master into x-updates

2014-08-02 05:08:07 +02:00

lisp-modules

…

misc

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

mobile

Use hyperlink and click action instead of meta refresh

2014-08-01 19:26:34 +02:00

ocaml-modules

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

perl-modules

Partially revert 7a45996 some more.

2014-07-28 20:52:47 +02:00

python-modules

freecad: updating to 0.14

2014-08-01 16:56:27 +02:00

qtcreator

…

r-modules

Added CRAN archive to R package derivation to prevent R expressions from

2014-07-08 11:02:05 +10:00

ruby-modules

…

tools

Merge recent master into x-updates

2014-08-02 05:08:07 +02:00

web

Merge pull request #3003 from offlinehacker/nixpkg/nodejs/buildNodePackage/shellHook

2014-07-26 08:53:52 +02:00