Alyssa Ross 4f4d95bbc2 Merge remote-tracking branch 'nixpkgs/master' into staging-next ... Conflicts: pkgs/development/python-modules/pyvex/default.nix pkgs/top-level/python-packages.nix		2021-04-23 13:49:12 +00:00
..
applications	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-04-23 13:49:12 +00:00
build-support
common-updater
data	Merge master into staging-next	2021-04-23 00:15:39 +00:00
desktops	Merge master into staging-next	2021-04-23 00:15:39 +00:00
development	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-04-23 13:49:12 +00:00
games	Merge pull request #120232 from IvarWithoutBones/bump/minecraft-launcher	2021-04-22 14:03:56 -07:00
misc	Merge master into staging-next	2021-04-23 00:15:39 +00:00
os-specific	Merge master into staging-next	2021-04-23 00:15:39 +00:00
pkgs-lib
servers	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-04-23 13:49:12 +00:00
shells
stdenv	Merge master into staging-next	2021-04-22 06:05:51 +00:00
test
tools	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-04-23 13:49:12 +00:00
top-level	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-04-23 13:49:12 +00:00