Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby ... Conflicts: pkgs/applications/version-management/git-and-tools/default.nix pkgs/applications/version-management/git-and-tools/hub/default.nix pkgs/tools/audio/mpdcron/default.nix		2015-01-20 20:21:03 -05:00
..
arduino	Change occurrences of gcc to the more general cc	2014-12-26 11:06:21 -06:00
compilers	rustcMaster: Update from 0.13-dev-g6539cb4 -> 1.0.0-dev-ga833337	2015-01-20 22:19:17 +01:00
coq-modules	coqPackages.fiat: enable building the examples as a test	2015-01-09 15:20:17 -06:00
eclipse	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
guile-modules	unmaintain a bunch of packages	2015-01-13 22:33:49 +01:00
haskell-modules	haskell-ng: disable some test suites that run forever	2015-01-21 00:10:12 +01:00
interpreters	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby	2015-01-20 20:21:03 -05:00
libraries	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby	2015-01-20 20:21:03 -05:00
lisp-modules	Update CLX	2015-01-18 01:58:20 +03:00
lua-modules
misc	Fix user-facing typos (mainly in descriptions)	2015-01-01 15:45:32 +01:00
mobile	java: Normalize to the default jre / jdk	2015-01-07 14:55:41 -08:00
ocaml-modules	Adds ocaml-jsonm	2015-01-20 18:02:51 +01:00
perl-modules	fix a bunch of perl modules	2014-12-10 01:38:00 +01:00
pharo	Update pharo vm	2014-12-04 16:41:20 +01:00
pure-modules/pure-gsl
python-modules	gevent: fix ssl patch	2015-01-20 22:40:58 +01:00
qtcreator	qtcreator: Update from 3.2.0 to 3.2.1	2014-10-14 18:00:57 +02:00
r-modules	r-modules: enable packages that were broken by the missing gdal dependency	2015-01-14 11:24:28 +01:00
ruby-modules
tools	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby	2015-01-20 20:21:03 -05:00
web	jdkPath: Remove in favor of jdk.home	2015-01-07 14:55:41 -08:00