From 75e293d679ed7b8d96cc3f06ccf4979d16d507d8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 19 Jan 2024 21:27:45 +0100
Subject: [PATCH] python311Packages.blocksat-cli: 0.4.6 -> 2.4.6

Diff: https://github.com/Blockstream/satellite/compare/refs/tags/v0.4.6...v2.4.6

Changelog: https://github.com/Blockstream/satellite/releases/tag/v2.4.6
---
 .../python-modules/blocksat-cli/default.nix   | 32 +++++++------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/blocksat-cli/default.nix b/pkgs/development/python-modules/blocksat-cli/default.nix
index 5ee25097d534..18437efceb4b 100644
--- a/pkgs/development/python-modules/blocksat-cli/default.nix
+++ b/pkgs/development/python-modules/blocksat-cli/default.nix
@@ -1,28 +1,30 @@
 { lib
 , buildPythonPackage
 , distro
-, fetchPypi
+, fetchFromGitHub
+, pyasyncore
 , pysnmp
 , pytestCheckHook
 , python-gnupg
+, pythonAtLeast
 , pythonOlder
 , qrcode
 , requests
 , setuptools
-, sseclient-py
-, zfec
 }:
 
 buildPythonPackage rec {
   pname = "blocksat-cli";
-  version = "0.4.6";
+  version = "2.4.6";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-uANAMNoAC4HUoUuR5ldxoiy+LLzZVpKosU5JttXLnqg=";
+  src = fetchFromGitHub {
+    owner = "Blockstream";
+    repo = "satellite";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-1gz2lAS/AHeY54AaVXGeofLC68KjAP7POsIaBL3v2EY=";
   };
 
   nativeBuildInputs = [
@@ -35,24 +37,14 @@ buildPythonPackage rec {
     python-gnupg
     qrcode
     requests
-    sseclient-py
-    zfec
+  ] ++ lib.optionals (pythonAtLeast "3.12") [
+    pyasyncore
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
   ];
 
-  disabledTestPaths = [
-    # disable tests which require being connected to the satellite
-    "blocksatcli/test_satip.py"
-    "blocksatcli/api/test_listen.py"
-    "blocksatcli/api/test_msg.py"
-    "blocksatcli/api/test_net.py"
-    # disable tests which require being online
-    "blocksatcli/api/test_order.py"
-  ];
-
   disabledTests = [
     "test_monitor_get_stats"
     "test_monitor_update_with_reporting_enabled"