Jonathan Ringer b4d83909f8 Revert "python3Packages.pyramid: 1.10.5 -> 2.0" ... This reverts commit 92ac2fe9be. Removed the "pyramid.compat" module, which is used by many other packages		2021-04-22 08:23:14 -07:00
..
applications	Merge master into staging-next	2021-04-22 12:06:24 +00:00
build-support	Merge master into staging-next	2021-04-19 18:11:51 +00:00
common-updater
data	Merge master into staging-next	2021-04-22 06:05:51 +00:00
desktops	Merge master into staging-next	2021-04-22 12:06:24 +00:00
development	Revert "python3Packages.pyramid: 1.10.5 -> 2.0"	2021-04-22 08:23:14 -07:00
games	Merge pull request #119763 from marius851000/fgfs	2021-04-21 06:22:28 +00:00
misc	Merge master into staging-next	2021-04-22 12:06:24 +00:00
os-specific	Merge master into staging-next	2021-04-22 12:06:24 +00:00
pkgs-lib
servers	Merge master into staging-next	2021-04-22 12:06:24 +00:00
shells	fishPlugins.done: init at 1.16.1	2021-04-21 10:04:32 -07:00
stdenv	Merge master into staging-next	2021-04-22 06:05:51 +00:00
test	tests.vim: init (moved from vim-utils.nix) (#119467)	2021-04-21 12:55:05 +02:00
tools	Merge master into staging-next	2021-04-22 12:06:24 +00:00
top-level	Merge master into staging-next	2021-04-22 12:06:24 +00:00