Compare commits
7 Commits
073e0268cd
...
17095f9856
Author | SHA1 | Date |
---|---|---|
Aidan Gauland | 17095f9856 | |
Aidan Gauland | 6a87dc2604 | |
Aidan Gauland | 0c36903c2e | |
Aidan Gauland | 758cbc3cc2 | |
Aidan Gauland | 17ded7214a | |
Aidan Gauland | 2d1633a19e | |
Aidan Gauland | 8f28d94d65 |
|
@ -0,0 +1,18 @@
|
|||
name: Test
|
||||
on:
|
||||
pull_request:
|
||||
schedule:
|
||||
- cron: "0 0 1 * *"
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: cachix/install-nix-action@v22
|
||||
with:
|
||||
nix_path: nixpkgs=channel:nixos-unstable
|
||||
- uses: cachix/cachix-action@v12
|
||||
with:
|
||||
name: nix-community
|
||||
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
||||
- run: nix-build --show-trace --argstr vs-overlay $GITHUB_WORKSPACE everything-shell.nix
|
|
@ -0,0 +1,102 @@
|
|||
# A Nix shell with VapourSynth and all plugins (from this overlay). Used for
|
||||
# testing that all plugins in this overlay build.
|
||||
{vs-overlay}: let
|
||||
pkgs = import <nixpkgs> {
|
||||
config.allowUnfree = true;
|
||||
overlays = [(import vs-overlay)];
|
||||
# Force default Python to 3.x
|
||||
config.packageOverrides = pkgs: {
|
||||
python = pkgs.python3;
|
||||
};
|
||||
};
|
||||
in
|
||||
# TODO: Fix broken packages, which are commented out below.
|
||||
pkgs.mkShell {
|
||||
packages = [
|
||||
(pkgs.vapoursynth.withPlugins [
|
||||
pkgs.vapoursynthPlugins.adaptivegrain
|
||||
pkgs.vapoursynthPlugins.addgrain
|
||||
pkgs.vapoursynthPlugins.autocrop
|
||||
pkgs.vapoursynthPlugins.awarpsharp2
|
||||
pkgs.vapoursynthPlugins.bestaudiosource
|
||||
pkgs.vapoursynthPlugins.beziercurve
|
||||
pkgs.vapoursynthPlugins.bifrost
|
||||
pkgs.vapoursynthPlugins.bilateral
|
||||
pkgs.vapoursynthPlugins.bm3d
|
||||
pkgs.vapoursynthPlugins.cas
|
||||
pkgs.vapoursynthPlugins.cnr2
|
||||
pkgs.vapoursynthPlugins.combmask
|
||||
pkgs.vapoursynthPlugins.continuityfixer
|
||||
pkgs.vapoursynthPlugins.ctmf
|
||||
# pkgs.vapoursynthPlugins.d2vsource
|
||||
pkgs.vapoursynthPlugins.dctfilter
|
||||
pkgs.vapoursynthPlugins.deblock
|
||||
pkgs.vapoursynthPlugins.decross
|
||||
pkgs.vapoursynthPlugins.descale
|
||||
pkgs.vapoursynthPlugins.dfttest
|
||||
pkgs.vapoursynthPlugins.eedi2
|
||||
pkgs.vapoursynthPlugins.eedi3m
|
||||
# pkgs.vapoursynthPlugins.f3kdb
|
||||
pkgs.vapoursynthPlugins.ffms2
|
||||
pkgs.vapoursynthPlugins.fft3dfilter
|
||||
pkgs.vapoursynthPlugins.fillborders
|
||||
pkgs.vapoursynthPlugins.fluxsmooth
|
||||
pkgs.vapoursynthPlugins.fmtconv
|
||||
pkgs.vapoursynthPlugins.histogram
|
||||
pkgs.vapoursynthPlugins.hqdn3d
|
||||
pkgs.vapoursynthPlugins.imwri
|
||||
pkgs.vapoursynthPlugins.knlmeanscl
|
||||
# pkgs.vapoursynthPlugins.lsmashsource
|
||||
pkgs.vapoursynthPlugins.median
|
||||
pkgs.vapoursynthPlugins.minideen
|
||||
pkgs.vapoursynthPlugins.miscfilters-obsolete
|
||||
pkgs.vapoursynthPlugins.motionmask
|
||||
pkgs.vapoursynthPlugins.msmoosh
|
||||
pkgs.vapoursynthPlugins.mvtools
|
||||
pkgs.vapoursynthPlugins.nnedi3
|
||||
pkgs.vapoursynthPlugins.nnedi3cl
|
||||
pkgs.vapoursynthPlugins.ocr
|
||||
pkgs.vapoursynthPlugins.placebo
|
||||
pkgs.vapoursynthPlugins.readmpls
|
||||
pkgs.vapoursynthPlugins.remap
|
||||
pkgs.vapoursynthPlugins.removegrain
|
||||
pkgs.vapoursynthPlugins.retinex
|
||||
pkgs.vapoursynthPlugins.sangnom
|
||||
pkgs.vapoursynthPlugins.scxvid
|
||||
pkgs.vapoursynthPlugins.subtext
|
||||
pkgs.vapoursynthPlugins.tcanny
|
||||
pkgs.vapoursynthPlugins.temporalmedian
|
||||
pkgs.vapoursynthPlugins.temporalsoften2
|
||||
pkgs.vapoursynthPlugins.tnlmeans
|
||||
pkgs.vapoursynthPlugins.ttempsmooth
|
||||
pkgs.vapoursynthPlugins.vivtc
|
||||
# Requires non-redistributable unfree TensorRT.
|
||||
# pkgs.vapoursynthPlugins.vstrt
|
||||
pkgs.vapoursynthPlugins.wwxd
|
||||
pkgs.vapoursynthPlugins.znedi3
|
||||
|
||||
# pkgs.vapoursynthPlugins.acsuite
|
||||
pkgs.vapoursynthPlugins.adjust
|
||||
pkgs.vapoursynthPlugins.astdr
|
||||
pkgs.vapoursynthPlugins.awsmfunc
|
||||
# pkgs.vapoursynthPlugins.debandshit
|
||||
pkgs.vapoursynthPlugins.dfmderainbow
|
||||
pkgs.vapoursynthPlugins.edi_rpow2
|
||||
pkgs.vapoursynthPlugins.finedehalo
|
||||
pkgs.vapoursynthPlugins.fvsfunc
|
||||
pkgs.vapoursynthPlugins.havsfunc
|
||||
pkgs.vapoursynthPlugins.kagefunc
|
||||
# pkgs.vapoursynthPlugins.lvsfunc
|
||||
pkgs.vapoursynthPlugins.mt_lutspa
|
||||
pkgs.vapoursynthPlugins.muvsfunc
|
||||
pkgs.vapoursynthPlugins.mvsfunc
|
||||
pkgs.vapoursynthPlugins.nnedi3_resample
|
||||
pkgs.vapoursynthPlugins.nnedi3_rpow2
|
||||
pkgs.vapoursynthPlugins.rekt
|
||||
# pkgs.vapoursynthPlugins.vardefunc
|
||||
# pkgs.vapoursynthPlugins.vsTAAmbk
|
||||
pkgs.vapoursynthPlugins.vsgan
|
||||
pkgs.vapoursynthPlugins.vsutil
|
||||
])
|
||||
];
|
||||
}
|
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vs-placebo";
|
||||
version = "1.4.2";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lypheo";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-nerS1z/Ch/UqcmcY2gNL1Xl3hs1/etEAODj8pzrSuEE=";
|
||||
sha256 = "sha256-1DTdllP+Y4s+t2PMnpcgeLjOxOyyV/yhFSxPP9/Gy9M=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,40 +1,29 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitLab, vapoursynthPlugins, vapoursynth }:
|
||||
{ lib, buildPythonPackage, setuptools, fetchFromGitHub, vapoursynthPlugins, vapoursynth }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rekt";
|
||||
version = "39";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "Ututu";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpusGang";
|
||||
repo = pname;
|
||||
rev = "153863e07779219c48cf1223bfdba86c47bc43be";
|
||||
sha256 = "1h83dqwn71pfqxx8hppbqc7i9mh0a2pbpydsm8jvf538z9nr2sl9";
|
||||
rev = version;
|
||||
sha256 = "sha256-SWu7W0DFoPLeTe4+aYQGUlaU0n63W3IB7Fdi71uqyzw=";
|
||||
};
|
||||
|
||||
# This does not depend on vapoursynth (since this is used from within
|
||||
# vapoursynth).
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "install_requires=['vapoursynth', " "install_requires=["
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with vapoursynthPlugins; [
|
||||
vsutil
|
||||
propagatedBuildInputs = [
|
||||
setuptools
|
||||
vapoursynthPlugins.vsutil
|
||||
];
|
||||
|
||||
checkInputs = [ vapoursynth ];
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# This overrides the default setuptools checkPhase that detects tests (that
|
||||
# don’t work) even though this package doesn’t have tests.
|
||||
runHook postCheck
|
||||
'';
|
||||
pythonImportsCheck = [ "rekt" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "VapourSynth wrapper for Cropping and Stacking clips";
|
||||
homepage = "https://gitlab.com/Ututu/rekt";
|
||||
license = licenses.unfree; # no license
|
||||
homepage = "https://github.com/OpusGang/rekt";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sbruder ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, vapoursynth
|
||||
, numpy
|
||||
, poetry
|
||||
, poetry-core
|
||||
, pytorch
|
||||
}:
|
||||
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
poetry
|
||||
poetry-core
|
||||
pytorch
|
||||
];
|
||||
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
nix-build --show-trace --argstr vs-overlay $PWD everything-shell.nix
|
Loading…
Reference in New Issue