Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix		2018-02-28 20:52:49 +02:00
..
arduino
beam-modules
bower-modules/generic
compilers	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
coq-modules
dotnet-modules/patches
eclipse/ecj
em-modules/generic
go-modules
guile-modules
haskell-modules	ghc84: remove unused overrides & minor proof updates	2018-02-28 02:17:44 +03:00
idris-modules
interpreters	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
java-modules
libraries	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
lisp-modules	lispPackages.xembed: init	2018-02-26 11:17:36 +01:00
lua-modules	lua packages: propagate libs with a setupHook	2018-02-25 21:24:47 +00:00
misc
mobile	prebuilt android tools: Init using SDK	2018-02-27 14:15:39 -05:00
node-packages	nodePackages: regenerate with node2nix 1.5.2	2018-02-28 00:07:56 +01:00
ocaml-modules	ocamlPackages.ctypes: 0.11.5 -> 0.13.1	2018-02-28 19:10:34 +01:00
perl-modules
pharo
pure-modules
python-modules	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
qtcreator
r-modules	Merge pull request #35651 from mnacamura/r-xml2-darwin	2018-02-26 20:16:16 +01:00
ruby-modules
stm32/betaflight
tools	Merge remote-tracking branch 'upstream/master' into staging	2018-02-28 20:52:49 +02:00
web	nodejs: keep the build headers (#35568)	2018-02-27 13:26:16 +00:00