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	platformio: add git to chroot so it is usable by platformio command	2018-05-05 02:41:10 -04:00
beam-modules
bower-modules/generic
compilers	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
coq-modules	coqPackages.dpdgraph: init at 0.6.3 for Coq 8.8	2018-05-09 08:03:10 +02:00
dotnet-modules/patches
em-modules/generic
go-modules
guile-modules	tree-wide: platforms = platforms.gnu; -> platforms = gnu ++ linux	2018-04-30 18:08:48 -05:00
haskell-modules	Merge remote-tracking branch 'upstream/master' into staging	2018-05-14 22:53:10 -04:00
idris-modules	idrisPackages.vdom: init at 0.6.0	2018-05-08 11:41:52 +02:00
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	asdf: 3.3.1 -> 3.3.2	2018-05-07 05:20:34 -07:00
lua-modules
misc	avrgcc: 7.3.0 -> 8.1.0	2018-05-07 05:59:21 -07:00
mobile	Merge branch 'fix-gcc-with-float'	2018-05-12 15:21:30 -04:00
node-packages	nodePackages.elm-oracle: init at 1.1.1	2018-05-07 10:38:16 +01:00
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	Merge branch 'staging' into fix-ncurses-darwin-extensions	2018-05-02 15:40:38 -05:00
tools	Merge remote-tracking branch 'upstream/master' into staging	2018-05-16 03:09:33 +03:00
web	Merge remote-tracking branch 'upstream/master' into staging	2018-05-08 09:36:00 -05:00