Tuomas Tynkkynen aba0b45b86 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/development/libraries/qt-5/5.7/qtbase/default.nix		2017-03-14 00:49:22 +02:00
..
arduino
beam-modules
bower-modules/generic
compilers	ispc: fix build	2017-03-13 12:07:48 +01:00
coq-modules
dotnet-modules/patches
eclipse/ecj
em-modules/generic
go-modules
guile-modules
haskell-modules	Merge pull request #23836 from expipiplus1/jailbreak-strict-io	2017-03-13 13:27:37 +01:00
idris-modules
interpreters	guile: enable parallel building	2017-03-13 23:38:52 +01:00
java-modules
libraries	Merge remote-tracking branch 'upstream/master' into staging	2017-03-14 00:49:22 +02:00
lisp-modules
lua-modules
misc
mobile
node-packages	nodePackages: support github:owner/repo scheme for package deps	2017-03-12 16:00:13 +01:00
ocaml-modules	ocamlPackages.cpuid: init at 0.1.0	2017-03-13 20:58:51 +00:00
perl-modules
pharo
pure-modules	purePackages.octave: 0.7 -> 0.9	2017-03-13 11:03:52 +01:00
python-modules	Merge pull request #23801 from zimbatm/pip-tools	2017-03-13 22:32:07 +01:00
qtcreator
r-modules	r-modules: update CRAN package set	2017-03-07 14:56:46 +01:00
ruby-modules	xapian-ruby: link against correct xapian	2017-03-06 20:24:07 +01:00
tools	Merge remote-tracking branch 'upstream/master' into staging	2017-03-14 00:49:22 +02:00
web	nodejs: 7.7.1 -> 7.7.2	2017-03-10 21:54:49 -05:00