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
..
arduino	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
compilers	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
coq-modules	coqPackages: add contribs (close #5242)	2015-01-25 07:36:10 +01:00
eclipse	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
guile-modules	rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc	2015-01-14 20:27:55 -08:00
haskell-modules	haskell-configuration-common.nix: clean up obsolete overrides	2015-02-02 14:13:22 +01:00
interpreters	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
libraries	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
lisp-modules	Update CLX	2015-01-18 01:58:20 +03:00
lua-modules	lua: Fixed luasql.patch	2014-10-01 06:00:06 +01:00
misc	mpc: also rename the attribute to libmpc	2015-01-17 09:55:32 +01:00
mobile	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
ocaml-modules	ocaml-zed: update from 1.3 to 1.4	2015-02-02 15:43:42 +01:00
perl-modules	perl DB_file: fix build by not changing $out/lib/perl5	2015-01-20 14:08:17 +01:00
pharo	Update pharo vm	2014-12-04 16:41:20 +01:00
pure-modules/pure-gsl	Add pure-gsl package	2014-10-14 21:21:36 +11:00
python-modules	Adds a new package: cherrytree - A hierarchical note taking application	2015-01-31 02:17:00 +01:00
qtcreator	qtcreator: Update from 3.2.0 to 3.2.1	2014-10-14 18:00:57 +02:00
r-modules	rPackages: allow users to override the version of R to be used for building	2015-01-27 14:04:54 +01:00
ruby-modules
tools	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
web	nodePackages: fix back compatibility	2015-01-25 01:42:02 +01:00