From 43c211605f31d27c93c8a9980ddc9e04c0c2b7e9 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 19 Nov 2019 13:06:57 -0500
Subject: [PATCH] bump to a tahoe-lafs with persistent storage plugin web
resource
---
tahoe-lafs.nix | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/tahoe-lafs.nix b/tahoe-lafs.nix
index 5dd929d..c75f6db 100644
--- a/tahoe-lafs.nix
+++ b/tahoe-lafs.nix
@@ -2,7 +2,7 @@
, twisted, foolscap, nevow, zfec
, setuptools, setuptoolsTrial, pyasn1, zope_interface
, service-identity, pyyaml, magic-wormhole, treq, appdirs
-, eliot, autobahn, cryptography
+, beautifulsoup4, eliot, autobahn, cryptography
}:
python.pkgs.buildPythonPackage rec {
version = "1.14.0.dev";
@@ -10,10 +10,10 @@ python.pkgs.buildPythonPackage rec {
src = fetchFromGitHub {
owner = "LeastAuthority";
repo = "tahoe-lafs";
- # HEAD of an integration branch for all of the storage plugin stuff. Last
- # updated October 4 2019.
- rev = "8c1f536ba4fbc01f3bc5f08412edbefc56ff7037";
- sha256 = "17d7pkbsgss3rhqf7ac7ylzbddi555rnkzz48zjqwq1zx1z2jhy6";
+ # A branch of master with the storage plugin web resource reuse issue
+ # resolved. https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3265
+ rev = "1fef61981940bbd63ffc4242c3b589258622d117";
+ sha256 = "0kgkg7wd0nkj8f5p46341vjkr6nz3kf0fimd44d9kypm4rn8xczv";
};
postPatch = ''
@@ -33,8 +33,7 @@ python.pkgs.buildPythonPackage rec {
twisted foolscap nevow zfec appdirs
setuptoolsTrial pyasn1 zope_interface
service-identity pyyaml magic-wormhole treq
-
- eliot autobahn cryptography setuptools
+ beautifulsoup4 eliot autobahn cryptography setuptools
];
checkInputs = with python.pkgs; [
--
GitLab