Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02:00
..
apache-ant	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
bam	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
buildbot	Add myself as maintainer for several packages	2013-05-20 20:28:15 +02:00
buildbot-slave	Add myself as maintainer for several packages	2013-05-20 20:28:15 +02:00
cmake	cmake: consistent names, to satisfy comments on #567	2013-06-27 16:33:24 +02:00
gnumake	gnumake: disable test suite on FreeBSD	2013-03-25 12:44:23 +01:00
gnumake-3.80	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
gradle	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
jam	svn merge ^/nixpkgs/trunk	2012-02-25 19:57:34 +00:00
leiningen	Add myself (the-kenny) to the maintainer list.	2013-03-30 21:05:15 +01:00
mk	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
ninja	ninja: Update to v1.3.4 and drop unzip dependency.	2013-06-21 12:17:55 +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	scons: updated to version 2.1.0	2012-03-13 08:29:18 +00:00
simple-build-tool	sbt: Use recommended java options	2013-06-25 12:31:44 +02:00