From 513f86c00297231875b05133a6aa444ba5adeb30 Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Sat, 28 Oct 2023 21:56:41 +1300 Subject: [PATCH] awsmfunc: unstable-2021-01-26 -> 1.3.4 Addresses #19 --- plugins/awsmfunc/default.nix | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/plugins/awsmfunc/default.nix b/plugins/awsmfunc/default.nix index c3fcbf9..b80077e 100644 --- a/plugins/awsmfunc/default.nix +++ b/plugins/awsmfunc/default.nix @@ -1,4 +1,4 @@ -{ lib, vapoursynthPlugins, buildPythonPackage, fetchgit, numpy, vapoursynth }: +{ lib, vapoursynthPlugins, buildPythonPackage, setuptools, fetchFromGitHub, numpy, vapoursynth }: let propagatedBinaryPlugins = with vapoursynthPlugins; [ descale @@ -9,23 +9,18 @@ let in buildPythonPackage rec { pname = "awsmfunc"; - version = "unstable-2021-01-26"; + version = "1.3.4"; + pyproject = true; - src = fetchgit { - url = "https://git.concertos.live/AHD/awsmfunc.git"; - rev = "e57ad6a976d059ffcf8ae59ee986bdbefef53cd0"; - sha256 = "0j2gzxcz3sy0h7r5a1dhl6xjgjd2m66mw4kfm8q2glar5b7gn0k7"; + src = fetchFromGitHub { + owner = "OpusGang"; + repo = pname; + rev = version; + hash = "sha256-7J7s/SdnA5/A/q4SaBfIWG+qOwHpjSrUzWkY1r63wwc="; }; - # This does not depend on vapoursynth (since this is used from within - # vapoursynth). - postPatch = '' - substituteInPlace requirements.txt \ - --replace "VapourSynth>=49" "" \ - --replace "rekt@https://gitlab.com/Ututu/rekt/-/archive/3da2b2f2b2d670e635cef6dcc61f19c8fe10f1fa/rekt-3da2b2f2b2d670e635cef6dcc61f19c8fe10f1fa.zip" "rekt" - ''; - propagatedBuildInputs = [ + setuptools numpy ] ++ (with vapoursynthPlugins; [ rekt @@ -37,8 +32,8 @@ buildPythonPackage rec { meta = with lib; { description = "A VapourSynth function collection"; - homepage = "https://git.concertos.live/AHD/awsmfunc"; - license = licenses.unfree; # no license + homepage = "https://github.com/OpusGang/awsmfunc"; + license = licenses.mit; maintainers = with maintainers; [ sbruder ]; platforms = platforms.all; };