Vladimír Čunát 09f5763784 Merge branch 'master' into staging-next ... Conflicts: - pkgs/development/python-modules/pathspec/default.nix The hashes are equivalent, so it's not a real conflict. - pkgs/top-level/static.nix I can't see a solution, deffered redoing this to the later PR: https://github.com/NixOS/nixpkgs/pull/136849		2021-09-07 08:43:26 +02:00
..
applications	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
build-support	Merge master into staging-next	2021-09-04 12:01:03 +00:00
common-updater
data	Merge branch 'master' into staging-next	2021-09-07 08:21:02 +02:00
desktops	Merge master into staging-next	2021-09-07 00:01:32 +00:00
development	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
games	Merge master into staging-next	2021-09-07 00:01:32 +00:00
misc	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
os-specific	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
pkgs-lib	formats: Fix yaml test	2021-08-26 01:57:43 +02:00
servers	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
shells	Merge pull request #136614 from symphorien/zsh-tz-completion	2021-09-03 13:04:07 -06:00
stdenv
test
tools	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00
top-level	Merge branch 'master' into staging-next	2021-09-07 08:43:26 +02:00