Dmitry Kalinkin c71b1bb92c Merge branch 'master' into staging-next ... Conflicts: pkgs/development/python-modules/jenkins-job-builder/default.nix pkgs/development/python-modules/snowflake-connector-python/default.nix		2021-12-11 13:59:09 -05:00
..
applications	Merge branch 'master' into staging-next	2021-12-11 13:59:09 -05:00
build-support	Merge branch 'master' into staging-next	2021-12-11 13:15:49 -05:00
common-updater
data
desktops
development	Merge branch 'master' into staging-next	2021-12-11 13:59:09 -05:00
games	Merge pull request #150265 from legendofmiracles/gzdoom	2021-12-11 17:45:54 +01:00
misc	Merge branch 'master' into staging-next	2021-12-11 13:15:49 -05:00
os-specific	Merge branch 'master' into staging-next	2021-12-11 13:15:49 -05:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2021-12-11 13:59:09 -05:00
shells
stdenv
test
tools	Merge branch 'master' into staging-next	2021-12-11 13:59:09 -05:00
top-level	Merge branch 'master' into staging-next	2021-12-11 13:59:09 -05:00