From b5984a603c746050c5839ded3c5104e91a8fa0c1 Mon Sep 17 00:00:00 2001
From: nixbitcoin <nixbitcoin@i2pmail.org>
Date: Wed, 8 Dec 2021 12:16:14 +0000
Subject: [PATCH] joinmarket: 0.9.3 -> 0.9.4

Ilita IRC server & use upstream twisted again
---
 modules/joinmarket.nix                        |  8 +++
 pkgs/joinmarket/default.nix                   |  4 +-
 pkgs/python-packages/default.nix              |  3 -
 .../specific-versions/twisted.nix             | 62 -------------------
 4 files changed, 10 insertions(+), 67 deletions(-)
 delete mode 100644 pkgs/python-packages/specific-versions/twisted.nix

diff --git a/modules/joinmarket.nix b/modules/joinmarket.nix
index 94a3479..79565ad 100644
--- a/modules/joinmarket.nix
+++ b/modules/joinmarket.nix
@@ -155,6 +155,14 @@ let
     port = 6667
     usessl = false
     ${socks5Settings}
+
+    # ilita
+    [MESSAGING:server4]
+    host = ilitafrzzgxymv6umx2ux7kbz3imyeko6cnqkvy4nisjjj4qpqkrptid.onion
+    channel = joinmarket-pit
+    port = 6667
+    usessl = false
+    ${socks5Settings}
   '';
 
   # Based on https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/master/jmclient/jmclient/configure.py
diff --git a/pkgs/joinmarket/default.nix b/pkgs/joinmarket/default.nix
index 898375a..931854d 100644
--- a/pkgs/joinmarket/default.nix
+++ b/pkgs/joinmarket/default.nix
@@ -1,10 +1,10 @@
 { stdenv, lib, fetchurl, python3, nbPython3Packages, pkgs }:
 
 let
-  version = "0.9.3";
+  version = "0.9.4";
   src = fetchurl {
     url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz";
-    sha256 = "0j00jjqbppvcj52dpyjfqzwsm86xf9h2yf15j35ah5gsdr317dgq";
+    sha256 = "1xkz274g9lv5yif77h0mci1fsgam56sdc8m281q3a8hij9nmzmq1";
   };
 
   runtimePackages = with nbPython3Packages; [
diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix
index 44d0001..023e64e 100644
--- a/pkgs/python-packages/default.nix
+++ b/pkgs/python-packages/default.nix
@@ -28,9 +28,6 @@ in {
   cryptography = callPackage ./specific-versions/cryptography {};
   cryptography_vectors = callPackage ./specific-versions/cryptography/vectors.nix {};
 
-  # twisted 20.3.0, required by joinmarketbase
-  twisted = callPackage ./specific-versions/twisted.nix {};
-
   # autobahn 20.12.3, required by joinmarketclient
   autobahn = callPackage ./specific-versions/autobahn.nix {};
 
diff --git a/pkgs/python-packages/specific-versions/twisted.nix b/pkgs/python-packages/specific-versions/twisted.nix
deleted file mode 100644
index 4215657..0000000
--- a/pkgs/python-packages/specific-versions/twisted.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ lib, stdenv
-, buildPythonPackage
-, fetchPypi
-, python
-, zope_interface
-, incremental
-, automat
-, constantly
-, hyperlink
-, pyhamcrest
-, attrs
-, pyopenssl
-, service-identity
-, setuptools
-, idna
-}:
-buildPythonPackage rec {
-  pname = "Twisted";
-  version = "20.3.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    extension = "tar.bz2";
-    sha256 = "040yzha6cyshnn6ljgk2birgh6mh2cnra48xp5ina5vfsnsmab6p";
-  };
-
-  propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ];
-
-  passthru.extras.tls = [ pyopenssl service-identity idna ];
-
-  # Patch t.p._inotify to point to libc. Without this,
-  # twisted.python.runtime.platform.supportsINotify() == False
-  patchPhase = lib.optionalString stdenv.isLinux ''
-    substituteInPlace src/twisted/python/_inotify.py --replace \
-      "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'"
-  '';
-
-  # Generate Twisted's plug-in cache.  Twisted users must do it as well.  See
-  # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3
-  # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for
-  # details.
-  postFixup = ''
-    $out/bin/twistd --help > /dev/null
-  '';
-
-  checkPhase = ''
-    ${python.interpreter} -m unittest discover -s twisted/test
-  '';
-  # Tests require network
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://twistedmatrix.com/";
-    description = "Twisted, an event-driven networking engine written in Python";
-    longDescription = ''
-      Twisted is an event-driven networking engine written in Python
-      and licensed under the MIT license.
-    '';
-    license = licenses.mit;
-    maintainers = [ ];
-  };
-}