Alyssa Ross ac5a927919 Merge remote-tracking branch 'nixpkgs/master' into staging-next ... Conflicts: pkgs/development/python-modules/einops/default.nix pkgs/development/python-modules/elegy/default.nix		2022-03-31 11:46:46 +00:00
..
applications	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
build-support	Merge branch 'master' into staging-next	2022-03-28 17:55:31 +02:00
common-updater
data	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
desktops	Merge remote-tracking branch 'origin/master' into staging-next	2022-03-31 03:49:37 +02:00
development	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
games	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
misc	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
os-specific	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
pkgs-lib
servers	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
shells	Merge pull request #166433 from r-ryantm/auto-update/oil	2022-03-30 20:00:34 +01:00
stdenv	Merge master into staging-next	2022-03-26 12:01:14 +00:00
test	Merge master into staging-next	2022-03-25 18:01:14 +00:00
tools	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00
top-level	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2022-03-31 11:46:46 +00:00