From 18135db24aa28d9afdc87ad6f538db571296f69d Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Tue, 20 Sep 2022 17:53:28 +1200 Subject: [PATCH] havsfunc: 33 -> unstable-2022-09-08 --- plugins/havsfunc/default.nix | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/plugins/havsfunc/default.nix b/plugins/havsfunc/default.nix index 190ad9f..06b2de1 100644 --- a/plugins/havsfunc/default.nix +++ b/plugins/havsfunc/default.nix @@ -1,17 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, vapoursynthPlugins, python, vapoursynth }: - -buildPythonPackage rec { - pname = "havsfunc"; - version = "33"; - - src = fetchFromGitHub { - owner = "HomeOfVapourSynthEvolution"; - repo = pname; - rev = "r${version}"; - sha256 = "14132gcy0zw348c40y2i8c7n3i1ygcnv9xrf83jp6m3b9v557z7p"; - }; - - propagatedBuildInputs = with vapoursynthPlugins; [ +let + plugins_native = with vapoursynthPlugins; [ addgrain adjust bm3d @@ -37,14 +26,33 @@ buildPythonPackage rec { ttempsmooth znedi3 ]; + plugins_python = with vapoursynthPlugins; [ + vsutil + ]; +in +buildPythonPackage rec { + pname = "havsfunc"; + version = "unstable-2022-09-08"; + src = fetchFromGitHub { + owner = "HomeOfVapourSynthEvolution"; + repo = pname; + rev = "2c6d3fedc3c4c3f3ed2460f7014d1227fe2fe207"; + sha256 = "sha256-YJl/X9niJelgovwUK6S50lvQUe/yYAbXEHWBbMqfXz0="; + }; format = "other"; + propagatedBuildInputs = plugins_native ++ plugins_python; + installPhase = '' + runHook preInstall + install -D havsfunc.py $out/${python.sitePackages}/havsfunc.py + + runHook postInstall ''; - checkInputs = [ (vapoursynth.withPlugins propagatedBuildInputs) ]; + checkInputs = [ (vapoursynth.withPlugins plugins_native ) ]; checkPhase = '' PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH '';