Tuomas Tynkkynen 3c6e077301 Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: pkgs/development/tools/misc/binutils/default.nix		2018-04-22 22:31:30 +03:00
..
arduino
beam-modules
bower-modules/generic
compilers	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00
coq-modules
dotnet-modules/patches
em-modules/generic
go-modules
guile-modules
haskell-modules	Merge pull request #39265 from expipiplus1/vector-sized-1	2018-04-21 08:18:25 +02:00
idris-modules
interpreters	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00
java-modules
libraries	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00
lisp-modules	lispPackages.postmodern: mark as broken	2018-04-12 23:04:01 +02:00
lua-modules
misc	treewide: rename bad filenames	2018-04-17 15:42:25 -05:00
mobile	cocoapods: init at 1.3.1 (#32583)	2018-04-21 14:37:56 -05:00
node-packages	node2nix: add nix as dependency (fix for #38946)	2018-04-14 23:17:25 +03:00
ocaml-modules	Merge pull request #37531 from ryantm/auto-update/ocaml-ppx_tools_versioned	2018-04-08 23:06:58 -05:00
perl-modules	Merge branch 'master' into minc_ecosystem	2018-04-21 20:18:27 +01:00
pharo
pure-modules
python-modules	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00
r-modules
ruby-modules	gem-config: include do_sqlite3	2018-04-21 12:36:06 +01:00
tools	Merge remote-tracking branch 'upstream/master' into HEAD	2018-04-22 22:31:30 +03:00
web	grails: 3.3.3 -> 3.3.5	2018-04-20 05:03:57 -07:00