Jonathan Ringer c227fb4b17 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/development/tools/rust/cargo-cache/default.nix pkgs/development/tools/rust/cargo-embed/default.nix pkgs/development/tools/rust/cargo-flash/default.nix pkgs/servers/nosql/influxdb2/default.nix		2021-05-17 07:01:38 -07:00
..
applications	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-17 07:01:38 -07:00
build-support	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-17 07:01:38 -07:00
common-updater
data	Merge pull request #121119 from SuperSandro2000/remove-gnidorah	2021-05-17 02:42:24 +02:00
desktops	Merge master into staging-next	2021-05-17 06:22:23 +00:00
development	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-17 07:01:38 -07:00
games	Merge master into staging-next	2021-05-17 06:22:23 +00:00
misc	Merge master into staging-next	2021-05-17 06:22:23 +00:00
os-specific	Merge master into staging-next	2021-05-17 06:22:23 +00:00
pkgs-lib
servers	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-17 07:01:38 -07:00
shells
stdenv	stdenv/darwin: Apple Silicon support	2021-05-17 00:27:02 +09:00
test	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-17 07:01:38 -07:00
tools	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-17 07:01:38 -07:00
top-level	Merge remote-tracking branch 'origin/master' into staging-next	2021-05-17 07:01:38 -07:00