From bdb824008a5dce5a610782ed9e85129d199dc887 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 8 May 2020 11:42:32 -0400
Subject: [PATCH] Try to fix the Nix build
---
nix/setup.cfg.patch | 13 +++++++++++++
zkapauthorizer.nix | 6 ++++++
2 files changed, 19 insertions(+)
create mode 100644 nix/setup.cfg.patch
diff --git a/nix/setup.cfg.patch b/nix/setup.cfg.patch
new file mode 100644
index 0000000..cc909bc
--- /dev/null
+++ b/nix/setup.cfg.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.cfg b/setup.cfg
+index 3856a101..371a19b3 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -38,7 +38,7 @@ install_requires =
+ python-challenge-bypass-ristretto
+ # Inherit our Twisted dependency from tahoe-lafs so we don't accidentally
+ # get the extras wrong here and break stuff.
+- tahoe-lafs==1.14.0
++ tahoe-lafs
+ treq
+
+ [versioneer]
diff --git a/zkapauthorizer.nix b/zkapauthorizer.nix
index e76b19c..89639e0 100644
--- a/zkapauthorizer.nix
+++ b/zkapauthorizer.nix
@@ -27,6 +27,12 @@ buildPythonPackage rec {
sphinx
];
+ patches = [
+ # Remove the Tahoe-LAFS version pin in distutils config. We have our own
+ # pinning and also our Tahoe-LAFS package has a bogus version number. :/
+ ./nix/setup.cfg.patch
+ ];
+
propagatedBuildInputs = [
attrs
zope_interface
--
GitLab