Merge pull request #126279 from fabaff/bump-snitun

pkgs/development/python-modules/hass-nabucasa/default.nix

@@ -24,10 +24,6 @@ buildPythonPackage rec {
     sha256 = "sha256-eQdbAQRKqnJGxnSTkk3gld9TX9MpP3J8LFNYH6peVIY=";
   };
 
-  postPatch = ''
-    sed -i 's/"acme.*"/"acme"/' setup.py
-  '';
-
   propagatedBuildInputs = [
     acme
     aiohttp
@@ -44,11 +40,17 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  postPatch = ''
+    sed -i 's/"acme.*"/"acme"/' setup.py
+    substituteInPlace setup.py \
+      --replace "snitun==" "snitun>="
+  '';
+
   pythonImportsCheck = [ "hass_nabucasa" ];
 
   meta = with lib; {
     homepage = "https://github.com/NabuCasa/hass-nabucasa";
-    description = "Home Assistant cloud integration by Nabu Casa, inc.";
+    description = "Python module for the Home Assistant cloud integration";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ Scriptkiddi ];
   };

pkgs/development/python-modules/snitun/default.nix

@@ -1,21 +1,35 @@
-{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub
-, attrs, cryptography, async-timeout, pytest-aiohttp, pytestCheckHook
+{ lib
+, stdenv
+, async-timeout
+, attrs
+, buildPythonPackage
+, cryptography
+, fetchFromGitHub
+, pytest-aiohttp
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "snitun";
-  version = "0.21.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "NabuCasa";
     repo = pname;
     rev = version;
-    sha256 = "sha256-oZHi/H9HOqGTFuhqPSZXntMzVJ3ZT4zNejezo0cDtqg=";
+    sha256 = "sha256-vx9F+Nat69Yadd+YpsnBCstnxCEICFJI14TdG6PvstI=";
   };
 
-  propagatedBuildInputs = [ attrs cryptography async-timeout ];
+  propagatedBuildInputs = [
+    async-timeout
+    attrs
+    cryptography
+  ];
 
-  checkInputs = [ pytestCheckHook pytest-aiohttp ];
+  checkInputs = [
+    pytest-aiohttp
+    pytestCheckHook
+  ];
 
   disabledTests = lib.optionals stdenv.isDarwin [
     "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61
@@ -26,10 +40,13 @@ buildPythonPackage rec {
     "test_peer_listener_timeout"
   ];
 
+  pythonImportsCheck = [ "snitun" ];
+
   meta = with lib; {
     homepage = "https://github.com/nabucasa/snitun";
     description = "SNI proxy with TCP multiplexer";
-    license = licenses.gpl3;
+    license = licenses.gpl3Only;
     maintainers = with maintainers; [ Scriptkiddi ];
+    platforms = platforms.linux;
   };
 }