Vladimír Čunát dbae4f109f Merge branch 'master' into staging ... Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-01-31 19:34:57 +01:00
..
arduino	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
compilers	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
coq-modules	coqPackages: add contribs (close #5242)	2015-01-25 07:36:10 +01:00
eclipse
guile-modules	rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc	2015-01-14 20:27:55 -08:00
haskell-modules	haskell-cartel: fix build with ghc 7.10.1	2015-01-30 18:43:29 +01:00
interpreters	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
libraries	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
lisp-modules	Update CLX	2015-01-18 01:58:20 +03:00
lua-modules
misc	mpc: also rename the attribute to libmpc	2015-01-17 09:55:32 +01:00
mobile	Merge branch 'master' into staging	2015-01-31 19:34:57 +01:00
ocaml-modules	Adds ocaml-cpdf	2015-01-30 20:04: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
python-modules	Adds a new package: cherrytree - A hierarchical note taking application	2015-01-31 02:17:00 +01:00
qtcreator
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 branch 'master' into staging	2015-01-31 19:34:57 +01:00
web	nodePackages: fix back compatibility	2015-01-25 01:42:02 +01:00