Jonathan Ringer 5df08e00cd Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/development/python-modules/opensimplex/default.nix pkgs/development/python-modules/pygame-gui/default.nix pkgs/top-level/aliases.nix pkgs/top-level/python-aliases.nix		2022-02-08 21:19:24 -08:00
..
androidndk-pkgs
beam-modules
bower-modules/generic
chez-modules
compilers	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-08 21:19:24 -08:00
coq-modules
dhall-modules
dotnet-modules
em-modules/generic
embedded
gnuradio-modules
go-modules
go-packages
guile-modules
haskell-modules	spago: 0.20.4 -> 0.20.5	2022-02-08 11:55:00 -08:00
idris-modules	idrisPackages.protobuf: move to alias set	2022-02-07 11:38:38 -08:00
interpreters	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-08 21:19:24 -08:00
java-modules
libraries	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-08 21:19:24 -08:00
lisp-modules
lua-modules
misc
mobile
nim-packages
node-packages	node-packages.nix: generate	2022-02-07 13:19:32 +01:00
ocaml-modules	ocamlPackages.core: 0.11.2 → 0.11.3	2022-02-08 18:09:46 +01:00
octave-modules
perl-modules
pharo
php-packages
pure-modules
python-modules	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-08 21:19:24 -08:00
python2-modules
quickemu
r-modules	rPackages: fix evaluation	2022-02-08 11:29:12 -08:00
ruby-modules
scheme-modules/scheme-bytestructures
tools	Merge remote-tracking branch 'origin/master' into staging-next	2022-02-08 21:19:24 -08:00
web	Merge master into staging-next	2022-02-07 18:01:27 +00:00