Jonathan Ringer 11a9ac00fc Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/tools/networking/xh/default.nix		2021-05-22 18:19:10 -07:00
..
androidndk-pkgs
arduino
beam-modules	erlang-ls: use rebar3Relx	2021-05-21 17:24:45 +09:00
bower-modules/generic
chez-modules
compilers	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-20 09:12:42 -07:00
coq-modules
dhall-modules
dotnet-modules
em-modules/generic
gnuradio-modules
go-modules
go-packages
guile-modules
haskell-modules	haskellPackages.hnix: Patch to fix broken location annotations	2021-05-22 16:14:27 +08:00
idris-modules
interpreters	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-22 18:19:10 -07:00
java-modules
libraries	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-22 18:19:10 -07:00
lisp-modules	nyxt: v2_pre-release-7 -> 2.0.0 (#124024)	2021-05-22 15:32:47 -04:00
lua-modules
misc
mobile
node-packages
ocaml-modules	ocamlPackages.luv: 0.5.7 -> 0.5.8	2021-05-18 22:28:27 +02:00
octave-modules
perl-modules
pharo
php-packages
pure-modules
python-modules	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-22 18:19:10 -07:00
r-modules
ruby-modules	Merge pull request #123445 from jnetod/zhf-ruby-libvirt	2021-05-22 20:13:48 +02:00
tools	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-22 18:19:10 -07:00
web	twitterBootstrap: 5.0.0 -> 5.0.1	2021-05-22 10:31:14 +00:00