Dmitry Kalinkin da8f155b2a Merge branch 'master' into staging-next ... Conflicts: pkgs/development/python-modules/sphinxext-opengraph/default.nix		2021-12-18 10:18:14 -05:00
..
applications	Merge branch 'master' into staging-next	2021-12-18 10:18:14 -05:00
build-support	Merge branch 'master' into staging-next	2021-12-18 10:18:14 -05:00
common-updater
data	Merge branch 'master' into staging-next	2021-12-16 16:55:25 -05:00
desktops	Merge pull request #139136 from r-ryantm/auto-update/notes-up	2021-12-18 14:04:08 +08:00
development	Merge branch 'master' into staging-next	2021-12-18 10:18:14 -05:00
games	Merge master into staging-next	2021-12-17 12:01:31 +00:00
misc	Merge branch 'master' into staging-next	2021-12-18 10:18:14 -05:00
os-specific	Merge branch 'master' into staging-next	2021-12-18 10:18:14 -05:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2021-12-18 10:18:14 -05:00
shells	Update zinit meta information to match source	2021-12-17 17:12:58 +00:00
stdenv	Merge master into staging-next	2021-12-11 00:01:48 +00:00
test	makeBinaryWrapper: Fix issues on aarch64-darwin/macOS 12 (Monterey)	2021-12-16 21:29:21 +01:00
tools	Merge branch 'master' into staging-next	2021-12-18 10:18:14 -05:00
top-level	Merge branch 'master' into staging-next	2021-12-18 10:18:14 -05:00