From b37d6022cb3630bd69f0c374b9f0e210629cae3f Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@leastauthority.com>
Date: Wed, 4 Dec 2024 19:08:16 +0000
Subject: [PATCH] Use nixpkgs-provided txi2p-tahoe

---
 nix/python-overrides.nix |  3 ---
 nix/txi2p.nix            | 39 ---------------------------------------
 2 files changed, 42 deletions(-)
 delete mode 100644 nix/txi2p.nix

diff --git a/nix/python-overrides.nix b/nix/python-overrides.nix
index 48a8e4515..1094e08a3 100644
--- a/nix/python-overrides.nix
+++ b/nix/python-overrides.nix
@@ -42,9 +42,6 @@ in {
     tahoe-lafs-src = self.lib.cleanSource ../.;
   };
 
-  # Some dependencies aren't packaged in nixpkgs so supply our own packages.
-  txi2p = self.callPackage ./txi2p.nix { };
-
   # collections-extended is currently broken for Python 3.11 in nixpkgs but
   # we know where a working version lives.
   collections-extended = self.callPackage ./collections-extended.nix {
diff --git a/nix/txi2p.nix b/nix/txi2p.nix
deleted file mode 100644
index 3464b7b3d..000000000
--- a/nix/txi2p.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-# package https://github.com/tahoe-lafs/txi2p
-#
-# if you need to update this package to a new txi2p release then
-#
-# 1. change value given to `buildPythonPackage` for `version` to match the new
-#    release
-#
-# 2. change the value given to `fetchPypi` for `sha256` to `lib.fakeHash`
-#
-# 3. run `nix-build`
-#
-# 4. there will be an error about a hash mismatch.  change the value given to
-#    `fetchPypi` for `sha256` to the "actual" hash value report.
-#
-# 5. if there are new runtime dependencies then add them to the argument list
-#    at the top.  if there are new test dependencies add them to the
-#    `checkInputs` list.
-#
-# 6. run `nix-build`.  it should succeed.  if it does not, seek assistance.
-#
-{ fetchPypi
-, buildPythonPackage
-, parsley
-, twisted
-, unittestCheckHook
-}:
-buildPythonPackage rec {
-  pname = "txi2p-tahoe";
-  version = "0.3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-+Vs9zaFS+ACI14JNxEme93lnWmncdZyFAmnTH0yhOiY=";
-  };
-
-  propagatedBuildInputs = [ twisted parsley ];
-  checkInputs = [ unittestCheckHook ];
-  pythonImportsCheck = [ "parsley" "ometa"];
-}