From cf266b999fb0227cdf037ab6a56097149ef2e8d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Feb 2022 10:36:14 +0000 Subject: [PATCH 1/2] python310Packages.xxh: 0.8.8 -> 0.8.9 --- pkgs/tools/networking/xxh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/tools/networking/xxh/default.nix index c03708f08a31..d86f1897eeb5 100644 --- a/pkgs/tools/networking/xxh/default.nix +++ b/pkgs/tools/networking/xxh/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec{ pname = "xxh"; - version = "0.8.8"; + version = "0.8.9"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-TzC8GTDmnYN56Rp5DyZxh+yGrkgWr6Xt86a/jyB3j5k="; + hash = "sha256-Uo7xFwE9e5MFWDlNWq15kg+4xf/hF4WGUNTpTK+rgVg="; }; propagatedBuildInputs = [ pexpect pyyaml openssh ]; From 3c583540a8f68f4fbd2fb660b20a467e90f20519 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Feb 2022 13:38:36 +0100 Subject: [PATCH 2/2] python3Packages.xxh: limit the supported Python releases --- pkgs/tools/networking/xxh/default.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/xxh/default.nix b/pkgs/tools/networking/xxh/default.nix index d86f1897eeb5..386b8cafbd12 100644 --- a/pkgs/tools/networking/xxh/default.nix +++ b/pkgs/tools/networking/xxh/default.nix @@ -1,8 +1,19 @@ -{ lib, fetchFromGitHub, buildPythonApplication, pexpect, pyyaml, openssh, nixosTests }: +{ lib +, fetchFromGitHub +, buildPythonApplication +, pexpect +, pyyaml +, openssh +, nixosTests +, pythonOlder +}: buildPythonApplication rec{ pname = "xxh"; version = "0.8.9"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; @@ -11,16 +22,20 @@ buildPythonApplication rec{ hash = "sha256-Uo7xFwE9e5MFWDlNWq15kg+4xf/hF4WGUNTpTK+rgVg="; }; - propagatedBuildInputs = [ pexpect pyyaml openssh ]; + propagatedBuildInputs = [ + pexpect + pyyaml + openssh + ]; passthru.tests = { inherit (nixosTests) xxh; }; meta = with lib; { - description = "Bring your favorite shell wherever you go through ssh"; + description = "Bring your favorite shell wherever you go through SSH"; homepage = "https://github.com/xxh/xxh"; license = licenses.bsd2; - maintainers = [ maintainers.pasqui23 ]; + maintainers = with maintainers; [ pasqui23 ]; }; }