Jan Malakhovski ad35019501 Merge branch 'master' into staging ... Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master		2018-05-26 00:20:17 +00:00
..
arduino
beam-modules
bower-modules/generic
compilers	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
coq-modules	coqPackages.tlc: 20171206 -> 20180316 (#40927)	2018-05-22 20:55:57 +02:00
dotnet-modules/patches
em-modules/generic
go-modules
guile-modules
haskell-modules	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
idris-modules	treewide: use appendToName where appropriate	2018-05-25 15:48:31 -05:00
interpreters	Merge remote-tracking branch 'upstream/master' into staging	2018-05-23 16:00:04 -04:00
java-modules
libraries	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
lisp-modules
lua-modules
misc
mobile	androidndk: Fix usage as crossSystem	2018-05-17 17:22:27 +02:00
node-packages	ios-rebuild: Unbreak build	2018-05-16 14:28:23 -04:00
ocaml-modules	Merge pull request #40884 from vbgl/ocaml-earley-ocaml	2018-05-24 23:05:38 +02:00
perl-modules	perlPackages.BerkeleyDB: fix db dependency	2018-05-22 17:49:04 +03:00
pharo
pure-modules
python-modules	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
r-modules
ruby-modules	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
tools	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
web	Merge remote-tracking branch 'upstream/master' into staging	2018-05-21 20:21:48 -04:00