Jan Tojnar 380c030740 Merge branch 'master' into staging-next ... ; Conflicts: ; pkgs/development/python-modules/aiohttp-socks/default.nix ; pkgs/development/python-modules/emv/default.nix ; pkgs/development/python-modules/mocket/default.nix ; pkgs/development/python-modules/types-protobuf/default.nix		2021-12-31 07:26:03 +01:00
..
applications	Merge branch 'master' into staging-next	2021-12-31 07:26:03 +01:00
build-support	Merge branch 'master' into staging-next	2021-12-31 07:26:03 +01:00
common-updater
data	Merge master into staging-next	2021-12-28 06:01:09 +00:00
desktops	Merge master into staging-next	2021-12-29 06:01:11 +00:00
development	Merge branch 'master' into staging-next	2021-12-31 07:26:03 +01:00
games	freeciv: 2.6.5 -> 2.6.6	2021-12-30 22:21:55 -08:00
misc	vimPlugins.statix: remove self dependency	2021-12-30 20:25:02 -05:00
os-specific	Merge branch 'master' into staging-next	2021-12-31 07:26:03 +01:00
pkgs-lib
servers	Merge branch 'master' into staging-next	2021-12-31 07:26:03 +01:00
shells	oil: 0.9.5 -> 0.9.6	2021-12-30 08:32:20 -05:00
stdenv
test
tools	Merge branch 'master' into staging-next	2021-12-31 07:26:03 +01:00
top-level	Merge branch 'master' into staging-next	2021-12-31 07:26:03 +01:00