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
..
apache-ant	Drop unnecessary setting of java.home	2014-01-25 03:04:46 +01:00
bam	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
buildbot	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
buildbot-slave	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
cmake	cmake, podofo: fix finding freetype-2.5	2014-06-26 18:24:44 +02:00
colormake	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
gnumake	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
gradle	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
jam	svn merge ^/nixpkgs/trunk	2012-02-25 19:57:34 +00:00
leiningen	leiningen: Update to 2.4.2.	2014-06-19 12:04:33 +02:00
mk	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
ninja	Change several package constraints from linux to unix	2014-04-12 16:01:16 -05:00
rebar	rebar: update from 2.2.0 to 2.3.0	2014-05-19 15:36:59 +02:00
remake	remake: bump from version 3.81+dbg-0.2 to 3.82+dbg-0.6	2013-06-22 21:09:43 +02:00
scons	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
simple-build-tool	simple-build-tool: update to version 0.13.5	2014-06-05 12:36:39 +02:00