From e7faa761e0b6f658dbe9baab4adb0876addc8fe8 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 7 Oct 2019 09:16:00 -0400
Subject: [PATCH] tahoe depends on setuptools at runtime now for pkg_resources
it didn't fail before when building tahoe-lafs directly, I don't know
why (something else pulls in setuptools but it's unclear what).
it does fail without this when running the system tests at integration time...
---
tahoe-lafs.nix | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tahoe-lafs.nix b/tahoe-lafs.nix
index 24a591e..5dd929d 100644
--- a/tahoe-lafs.nix
+++ b/tahoe-lafs.nix
@@ -1,6 +1,6 @@
{ fetchFromGitHub, nettools, python
, twisted, foolscap, nevow, zfec
-, setuptoolsTrial, pyasn1, zope_interface
+, setuptools, setuptoolsTrial, pyasn1, zope_interface
, service-identity, pyyaml, magic-wormhole, treq, appdirs
, eliot, autobahn, cryptography
}:
@@ -34,7 +34,7 @@ python.pkgs.buildPythonPackage rec {
setuptoolsTrial pyasn1 zope_interface
service-identity pyyaml magic-wormhole treq
- eliot autobahn cryptography
+ eliot autobahn cryptography setuptools
];
checkInputs = with python.pkgs; [
@@ -44,7 +44,6 @@ python.pkgs.buildPythonPackage rec {
];
checkPhase = ''
- ${python}/bin/python -m twisted.trial -j4 allmydata
+ $out/bin/tahoe --version
'';
- doCheck = false;
}
--
GitLab