Shea Levy c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' ... Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-02-02 21:14:28 -05:00
..
apache-ant	Add coreutils dependency to ant launcher script	2014-09-17 03:54:25 +01:00
apache-maven	maven: 3.2.3 -> 3.2.5	2015-01-21 22:01:15 +01:00
bam	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
boot	Clojure: boot: Add new derivation for boot build tooling	2015-01-30 09:33:55 +00:00
buildbot	buildbot{,-slave}: update 0.8.8 -> 0.8.10	2014-12-09 19:14:03 +01:00
buildbot-slave	buildbot{,-slave}: update 0.8.8 -> 0.8.10	2014-12-09 19:14:03 +01:00
cargo	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
cmake	Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist	2014-11-09 18:31:46 +03:00
colormake	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
dub	dub: Add dub to interact with the D package registry	2015-01-18 18:32:46 +01:00
gnumake	unmaintain a bunch of packages	2015-01-13 22:33:49 +01:00
gradle	keeping gradle updated	2014-12-11 04:19:14 +01:00
icmake	icmake: update from 7.21.01 to 7.22.00	2015-01-21 13:21:59 +01:00
jam	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
leiningen	leiningen: Update to 2.5.1.	2015-01-10 14:38:45 +01:00
mk	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
ninja	ninja: 1.4.0 -> 1.5.1	2014-08-20 01:13:33 -05:00
rebar	Elixir and rebar aren't Linux-specific tools	2014-09-03 20:14:57 +01: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
sbt	sbt: update to version 0.13.7	2014-11-19 18:50:59 +01:00
scons	Update SCons	2014-10-06 02:43:58 +04:00
tup	Add tup	2015-01-14 01:37:44 -05:00