Tuomas Tynkkynen 6b6a575748 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/tools/networking/telnet/default.nix pkgs/top-level/aliases.nix		2018-05-16 03:09:33 +03:00
..
arduino
beam-modules
bower-modules/generic
compilers	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
coq-modules
dotnet-modules/patches
em-modules/generic
go-modules
guile-modules
haskell-modules	Merge remote-tracking branch 'upstream/master' into staging	2018-05-14 22:53:10 -04:00
idris-modules
interpreters	Merge remote-tracking branch 'upstream/staging' into strictDeps	2018-05-14 23:33:03 -04:00
java-modules
libraries	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
lisp-modules
lua-modules
misc
mobile	Merge branch 'fix-gcc-with-float'	2018-05-12 15:21:30 -04:00
node-packages
ocaml-modules	Merge pull request #40475 from r-ryantm/auto-update/ocurl	2018-05-15 18:52:29 +02:00
perl-modules	perlPackages.DBFile: db -> db.lib	2018-05-13 13:00:24 +00:00
pharo
pure-modules
python-modules	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
r-modules	rPackages.JuniperKernel: fix non-Darwin build	2018-05-15 17:50:11 +09:00
ruby-modules
tools	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
web