Jonathan Ringer f7a112f6c4 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/applications/graphics/emulsion/default.nix pkgs/development/tools/misc/texlab/default.nix pkgs/development/tools/rust/bindgen/default.nix pkgs/development/tools/rust/cargo-udeps/default.nix pkgs/misc/emulators/ruffle/default.nix pkgs/tools/misc/code-minimap/default.nix		2021-05-18 08:57:16 -07:00
..
androidndk-pkgs
arduino	platformio: 5.0.4 -> 5.1.1	2021-05-17 18:02:21 +09:00
beam-modules	pc: 0.6.0 => 1.12.0	2021-05-18 05:40:58 +09:00
bower-modules/generic
chez-modules
compilers	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-18 08:57:16 -07:00
coq-modules	coqPackages.relation-algebra: init	2021-05-17 10:17:18 +02:00
dhall-modules
dotnet-modules	python-language-server: cleanup deps, add missing phase hooks	2021-05-15 16:20:43 -07:00
em-modules/generic
gnuradio-modules
go-modules
go-packages
guile-modules
haskell-modules
idris-modules
interpreters	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-18 08:57:16 -07:00
java-modules
libraries	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-18 08:57:16 -07:00
lisp-modules
lua-modules
misc
mobile
node-packages
ocaml-modules	ocamlPackages.bap: fix for multiple outputs llvmPackages	2021-05-18 01:44:31 +02:00
octave-modules
perl-modules
pharo
php-packages
pure-modules
python-modules	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-18 08:57:16 -07:00
r-modules
ruby-modules
tools	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-18 08:57:16 -07:00
web	Merge pull request #123436 from r-ryantm/auto-update/deno	2021-05-18 10:38:50 +02:00