From 5b0089f101253c34a30ef0161af8865822b7f870 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Dec 2024 12:05:04 +0000 Subject: [PATCH 1/2] python312Packages.rawpy: 0.23.2 -> 0.24.0 --- pkgs/development/python-modules/rawpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rawpy/default.nix b/pkgs/development/python-modules/rawpy/default.nix index 6931b96afcf9..6270febe7bfa 100644 --- a/pkgs/development/python-modules/rawpy/default.nix +++ b/pkgs/development/python-modules/rawpy/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "rawpy"; - version = "0.23.2"; + version = "0.24.0"; pyproject = true; src = fetchFromGitHub { owner = "letmaik"; repo = "rawpy"; - rev = "refs/tags/v${version}"; - hash = "sha256-s7/YbD5Jy9Jzry817djG63Zs4It8b1S95qmcJgPYGZQ="; + tag = "v${version}"; + hash = "sha256-u/KWbviyhbMts40Gc/9shXSESwihWZQQaf3Z44gMgvs="; }; build-system = [ From 7a6360aa2522fe6fa361b3049f1a1df6c9db706f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 15 Dec 2024 15:27:11 +0100 Subject: [PATCH 2/2] rclip: relax rawpy dependency --- pkgs/by-name/rc/rclip/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index 64275a277f22..df91b877f63c 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchFromGitHub, + versionCheckHook, }: python3Packages.buildPythonApplication rec { pname = "rclip"; @@ -11,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "yurijmikhalevich"; repo = "rclip"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-bu9kz0CCq78lp+d2uPoApzZnVybwyWD/fwgnXYG52dk="; }; @@ -32,13 +33,17 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "pillow" + "rawpy" "torch" "torchvision" ]; pythonImportsCheck = [ "rclip" ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = [ + versionCheckHook + ] ++ (with python3Packages; [ pytestCheckHook ]); + versionCheckProgramArg = [ "--version" ]; disabledTestPaths = [ # requires network @@ -55,7 +60,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "AI-Powered Command-Line Photo Search Tool"; homepage = "https://github.com/yurijmikhalevich/rclip"; - changelog = "https://github.com/yurijmikhalevich/rclip/releases/tag/v${version}"; + changelog = "https://github.com/yurijmikhalevich/rclip/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ iynaix ]; mainProgram = "rclip";