Merge staging-next into staging

2021-02-17 06:14:55 +00:00
parent 0d489fc753 3ed237717a
commit cd9df16806
94 changed files with 777 additions and 649 deletions
@@ -1,5 +1,4 @@
 { lib, fetchgit, buildPythonPackage
-, python
 , buildGoModule
 , srht, redis, celery, pyyaml, markdown }:

@@ -1,5 +1,4 @@
 { lib, fetchgit, buildPythonPackage
-, python
 , srht, pyyaml, PyGithub }:

 buildPythonPackage rec {
@@ -1,5 +1,4 @@
 { lib, fetchgit, buildPythonPackage
-, python
 , buildGoModule
 , srht, minio, pygit2, scmsrht }:

@@ -1,5 +1,4 @@
 { lib, fetchhg, buildPythonPackage
-, python
 , srht, hglib, scmsrht, unidiff }:

 buildPythonPackage rec {
@@ -1,5 +1,4 @@
 { lib, fetchgit, buildPythonPackage
-, python
 , srht }:

 buildPythonPackage rec {
@@ -1,5 +1,4 @@
 { lib, fetchgit, buildPythonPackage
-, python
 , srht, asyncpg, aiosmtpd, pygit2, emailthreads }:

 buildPythonPackage rec {
@@ -1,5 +1,4 @@
 { lib, fetchgit, buildPythonPackage
-, python
 , srht, pygit2 }:

 buildPythonPackage rec {
@@ -1,5 +1,4 @@
 { lib, fetchgit, buildPythonPackage
-, python
 , buildGoModule
 , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache
 , sshpubkeys, weasyprint }:
@@ -1,5 +1,4 @@
 { lib, fetchgit, buildPythonPackage
-, python
 , srht, pyyaml }:

 buildPythonPackage rec {
@@ -1,7 +1,6 @@
 { lib, fetchgit, buildPythonPackage
-, python
 , srht, redis, alembic, pystache
-, pytest, factory_boy, writeText }:
+, pytest, factory_boy }:

 buildPythonPackage rec {
  pname = "todosrht";