Merge branch 'master' into staging-next

2021-03-03 19:47:08 +01:00
parent 7fe25d37fa 58a5417197
commit 9bfe3b3e41
130 changed files with 930 additions and 482 deletions
@@ -6927,6 +6927,8 @@ in {

  rfc7464 = callPackage ../development/python-modules/rfc7464 { };

+  rfcat = callPackage ../development/python-modules/rfcat { };
+
  rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl { });

  rich = callPackage ../development/python-modules/rich { };