working

new.nix

@@ -23,6 +23,8 @@ in
       chardet = "wheel";
       urllib3 = "wheel";
       zipp = "wheel";
+      # marked broken
+      magic-wormhole = "wheel";
     };
     tahoe-lafs = mach-nix.buildPythonPackage {
       python = "python27";
@@ -61,6 +63,12 @@ in
           }
         )
       ];
+      requirementsExtra = ''
+        pyrsistent
+        foolscap == 0.13.1
+        configparser
+        eliot
+      '';
       format = "setuptools";
       # Record some settings here, so downstream nix files can consume them.
       meta.mach-nix = { inherit python providers; };

nix/sources.json

@@ -29,10 +29,10 @@
         "homepage": "",
         "owner": "DavHau",
         "repo": "pypi-deps-db",
-        "rev": "1f60509dcf1877b3bdee057412cbc938ccdb5d77",
-        "sha256": "1f6n1jcpi8pphyp5l76mcimywzw0if6h36glwjd62ki82d2jxq6b",
+        "rev": "4ac3cefbc167b71361d8e732c9c5febdd0b8df72",
+        "sha256": "0ck79imx7sw0ka12rs2x03ignss1gdxfvi439ya847ic7j5mqpkj",
         "type": "tarball",
-        "url": "https://github.com/DavHau/pypi-deps-db/archive/1f60509dcf1877b3bdee057412cbc938ccdb5d77.tar.gz",
+        "url": "https://github.com/DavHau/pypi-deps-db/archive/4ac3cefbc167b71361d8e732c9c5febdd0b8df72.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "release2015": {

requirements/base.txt

@@ -117,7 +117,6 @@ pyopenssl==21.0.0
     # via
     #   foolscap
     #   twisted
-tahoe-lafs
 pyrsistent==0.16.1
     # via
     #   eliot
@@ -150,6 +149,8 @@ six==1.16.0
     #   txaio
 spake2==0.8
     # via magic-wormhole
+https://github.com/tahoe-lafs/tahoe-lafs/archive/be5f5839b3484c278a051f375d18952e23940677.tar.gz
+    # via -r requirements/base.in
 tqdm==4.62.3
     # via magic-wormhole
 treq==21.1.0
@@ -180,3 +181,10 @@ zope.interface==5.4.0
     #   tahoe-lafs
     #   twisted
     #   txtorcon
+
+# The following packages are considered to be unsafe in a requirements file:
+setuptools==44.1.1
+    # via
+    #   collections-extended
+    #   tahoe-lafs
+    #   zope.interface

scripts/pin-requirements

@@ -3,3 +3,5 @@
 export PYTHONPATH=.
 pip-compile -q --allow-unsafe requirements/base.in -o requirements/base.txt
 pip-compile -q --allow-unsafe requirements/test.in -o requirements/test.txt --pip-args "-c requirements/base.txt"
+
+sed -i '\,http://github.com/tahoe-lafs/tahoe-lafs,s,.*,tahoe-lafs,' requirements/base.txt

setup.cfg

@@ -41,6 +41,9 @@ install_requires =
     tahoe-lafs >=1.14, <1.17, !=1.15.*
     treq
     pyutil
+    # py2 stuff
+    autobahn < 20
+    bcrypt < 3.2
 
 [options.extras_require]
 test = coverage; fixtures; testtools; hypothesis