git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #126279 from fabaff/bump-snitun
commit3bcef6b30beb33749af33893e1a40883d71d5331 authorSandro <sandro.jaeckel@gmail.com> dateTue 15 Jun 2021, 03:30 (5 years ago) parent4cdf6df82d99d3
2 files changed+31−12
pkgs/development/python-modules/hass-nabucasa/default.nix+7−5 pkgs/development/python-modules/snitun/default.nix+24−7
pkgs/development/python-modules/hass-nabucasa/default.nix+7−5
@@ -24,10 +24,6 @@ buildPythonPackage rec {
2424 sha256 = "sha256-eQdbAQRKqnJGxnSTkk3gld9TX9MpP3J8LFNYH6peVIY=";
2525 };
2626
27− postPatch = ''
28− sed -i 's/"acme.*"/"acme"/' setup.py
29− '';
30−
3127 propagatedBuildInputs = [
3228 acme
3329 aiohttp
@@ -44,11 +40,17 @@ buildPythonPackage rec {
4440 pytestCheckHook
4541 ];
4642
43+ postPatch = ''
44+ sed -i 's/"acme.*"/"acme"/' setup.py
45+ substituteInPlace setup.py \
46+ --replace "snitun==" "snitun>="
47+ '';
48+
4749 pythonImportsCheck = [ "hass_nabucasa" ];
4850
4951 meta = with lib; {
5052 homepage = "https://github.com/NabuCasa/hass-nabucasa";
51− description = "Home Assistant cloud integration by Nabu Casa, inc.";
53+ description = "Python module for the Home Assistant cloud integration";
5254 license = licenses.gpl3Only;
5355 maintainers = with maintainers; [ Scriptkiddi ];
5456 };
pkgs/development/python-modules/snitun/default.nix+24−7
@@ -1,21 +1,35 @@
1−{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub
2−, attrs, cryptography, async-timeout, pytest-aiohttp, pytestCheckHook
1+{ lib
2+, stdenv
3+, async-timeout
4+, attrs
5+, buildPythonPackage
6+, cryptography
7+, fetchFromGitHub
8+, pytest-aiohttp
9+, pytestCheckHook
310}:
411
512buildPythonPackage rec {
613 pname = "snitun";
7− version = "0.21.0";
14+ version = "0.27.0";
815
916 src = fetchFromGitHub {
1017 owner = "NabuCasa";
1118 repo = pname;
1219 rev = version;
13− sha256 = "sha256-oZHi/H9HOqGTFuhqPSZXntMzVJ3ZT4zNejezo0cDtqg=";
20+ sha256 = "sha256-vx9F+Nat69Yadd+YpsnBCstnxCEICFJI14TdG6PvstI=";
1421 };
1522
16− propagatedBuildInputs = [ attrs cryptography async-timeout ];
23+ propagatedBuildInputs = [
24+ async-timeout
25+ attrs
26+ cryptography
27+ ];
1728
18− checkInputs = [ pytestCheckHook pytest-aiohttp ];
29+ checkInputs = [
30+ pytest-aiohttp
31+ pytestCheckHook
32+ ];
1933
2034 disabledTests = lib.optionals stdenv.isDarwin [
2135 "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61
@@ -26,10 +40,13 @@ buildPythonPackage rec {
2640 "test_peer_listener_timeout"
2741 ];
2842
43+ pythonImportsCheck = [ "snitun" ];
44+
2945 meta = with lib; {
3046 homepage = "https://github.com/nabucasa/snitun";
3147 description = "SNI proxy with TCP multiplexer";
32− license = licenses.gpl3;
48+ license = licenses.gpl3Only;
3349 maintainers = with maintainers; [ Scriptkiddi ];
50+ platforms = platforms.linux;
3451 };
3552}