From c96b904dd971fe39e7ebf4bd1920cf1ce69bde8d Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 3 Oct 2019 14:42:14 -0400
Subject: [PATCH] Get rid of darcs, pycryptopp, and pycrypto (bring in
cryptography)
---
tahoe-lafs.nix | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tahoe-lafs.nix b/tahoe-lafs.nix
index e325918..eb9a33c 100644
--- a/tahoe-lafs.nix
+++ b/tahoe-lafs.nix
@@ -1,8 +1,8 @@
-{ fetchFromGitHub, nettools, pythonPackages, buildPythonPackage
-, twisted, foolscap, nevow, simplejson, zfec, pycryptopp, darcsver
-, setuptoolsTrial, setuptoolsDarcs, pycrypto, pyasn1, zope_interface
+{ fetchFromGitHub, nettools, python
+, twisted, foolscap, nevow, zfec
+, setuptoolsTrial, pyasn1, zope_interface
, service-identity, pyyaml, magic-wormhole, treq, appdirs
-, eliot, autobahn
+, eliot, autobahn, cryptography
}:
buildPythonPackage rec {
version = "1.14.0.dev";
@@ -29,12 +29,12 @@ buildPythonPackage rec {
'';
- propagatedBuildInputs = with pythonPackages; [
- twisted foolscap nevow simplejson zfec pycryptopp darcsver
- setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface
- service-identity pyyaml magic-wormhole treq appdirs
+ propagatedBuildInputs = with python.pkgs; [
+ twisted foolscap nevow zfec appdirs
+ setuptoolsTrial pyasn1 zope_interface
+ service-identity pyyaml magic-wormhole treq
- eliot autobahn
+ eliot autobahn cryptography
];
doCheck = false;
--
GitLab