From 22b0bb03262762fcb0405d8632311e3486ca9bf2 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Wed, 1 Jul 2026 12:02:11 +0200 Subject: [PATCH 1/2] iredis: 1.15.2 -> 1.16.1 changelog: https://github.com/laixintao/iredis/blob/v1.16.1/CHANGELOG.md diff: https://github.com/laixintao/iredis/compare/v1.15.2...v1.16.1 --- pkgs/by-name/ir/iredis/package.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ir/iredis/package.nix b/pkgs/by-name/ir/iredis/package.nix index a8fbb956c9ef..c621cfac7acc 100644 --- a/pkgs/by-name/ir/iredis/package.nix +++ b/pkgs/by-name/ir/iredis/package.nix @@ -7,22 +7,20 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "iredis"; - version = "1.15.2"; + version = "1.16.1"; pyproject = true; src = fetchFromGitHub { owner = "laixintao"; repo = "iredis"; tag = "v${finalAttrs.version}"; - hash = "sha256-g/gQb9QOyfa7kyHCUZf/kLZRO5IE8389BUCYz8Sqr8o="; + hash = "sha256-m8XDNzHgMWBgcN3AyFlb8K/UNXbGhH4toKBiX5Q4/QY="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'packaging = "^23.0"' 'packaging = "*"' \ - --replace-fail 'wcwidth = "0.1.9"' 'wcwidth = "*"' \ - --replace-fail 'redis = "^5.0.0"' 'redis = "*"' - ''; + pythonRelaxDeps = [ + "packaging" + "redis" + ]; nativeBuildInputs = with python3.pkgs; [ poetry-core @@ -37,7 +35,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pygments python-dateutil redis - wcwidth ]; nativeCheckInputs = with python3.pkgs; [ From 6cc3d60de204045a3dccccb1bc0b7e55e065ec02 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Wed, 1 Jul 2026 12:09:36 +0200 Subject: [PATCH 2/2] iredis: modernize --- pkgs/by-name/ir/iredis/package.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ir/iredis/package.nix b/pkgs/by-name/ir/iredis/package.nix index c621cfac7acc..bef043b7dcbd 100644 --- a/pkgs/by-name/ir/iredis/package.nix +++ b/pkgs/by-name/ir/iredis/package.nix @@ -1,14 +1,16 @@ { lib, stdenv, - python3, + python3Packages, fetchFromGitHub, + versionCheckHook, }: -python3.pkgs.buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "iredis"; version = "1.16.1"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "laixintao"; @@ -22,11 +24,11 @@ python3.pkgs.buildPythonApplication (finalAttrs: { "redis" ]; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3Packages; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ click configobj mistune @@ -37,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { redis ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ freezegun pexpect pytestCheckHook @@ -62,6 +64,11 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pythonImportsCheck = [ "iredis" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = { description = "Terminal Client for Redis with AutoCompletion and Syntax Highlighting"; changelog = "https://github.com/laixintao/iredis/blob/${finalAttrs.src.tag}/CHANGELOG.md";