Use mkShell instead of runCommand

Aidan Gauland 2023-11-18 17:39:24 +13:00
parent 7082e8bb75
commit d292d9ff0c
No known key found for this signature in database
GPG Key ID: 16E68DD2D0E77C91
4 changed files with 104 additions and 99 deletions

View File

@ -13,4 +13,4 @@ jobs:
with:
name: nix-community
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: nix-build --show-trace --argstr vs-overlay $GITHUB_WORKSPACE test-build.nix
- run: nix-build --show-trace --argstr vs-overlay $GITHUB_WORKSPACE everything-shell.nix

102
everything-shell.nix Normal file
View File

@ -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
])
];
}

View File

@ -1,97 +0,0 @@
{vs-overlay}:
with import <nixpkgs> {
config.allowUnfree = true;
overlays = [(import vs-overlay)];
# Force default Python to 3.x
config.packageOverrides = pkgs: {
python = pkgs.python3;
};
};
# TODO: Fix broken packages, which are commented out below.
runCommand "vs-overlay-plugins-build-test" {
buildInputs = [
vapoursynthPlugins.adaptivegrain
vapoursynthPlugins.addgrain
vapoursynthPlugins.autocrop
vapoursynthPlugins.awarpsharp2
vapoursynthPlugins.bestaudiosource
vapoursynthPlugins.beziercurve
vapoursynthPlugins.bifrost
vapoursynthPlugins.bilateral
vapoursynthPlugins.bm3d
vapoursynthPlugins.cas
vapoursynthPlugins.cnr2
vapoursynthPlugins.combmask
vapoursynthPlugins.continuityfixer
vapoursynthPlugins.ctmf
# vapoursynthPlugins.d2vsource
vapoursynthPlugins.dctfilter
vapoursynthPlugins.deblock
vapoursynthPlugins.decross
vapoursynthPlugins.descale
vapoursynthPlugins.dfttest
vapoursynthPlugins.eedi2
vapoursynthPlugins.eedi3m
# vapoursynthPlugins.f3kdb
vapoursynthPlugins.ffms2
vapoursynthPlugins.fft3dfilter
vapoursynthPlugins.fillborders
vapoursynthPlugins.fluxsmooth
vapoursynthPlugins.fmtconv
vapoursynthPlugins.histogram
vapoursynthPlugins.hqdn3d
vapoursynthPlugins.imwri
vapoursynthPlugins.knlmeanscl
# vapoursynthPlugins.lsmashsource
vapoursynthPlugins.median
vapoursynthPlugins.minideen
vapoursynthPlugins.miscfilters-obsolete
vapoursynthPlugins.motionmask
vapoursynthPlugins.msmoosh
vapoursynthPlugins.mvtools
vapoursynthPlugins.nnedi3
vapoursynthPlugins.nnedi3cl
vapoursynthPlugins.ocr
# vapoursynthPlugins.placebo
vapoursynthPlugins.readmpls
vapoursynthPlugins.remap
vapoursynthPlugins.removegrain
vapoursynthPlugins.retinex
vapoursynthPlugins.sangnom
vapoursynthPlugins.scxvid
vapoursynthPlugins.subtext
vapoursynthPlugins.tcanny
vapoursynthPlugins.temporalmedian
vapoursynthPlugins.temporalsoften2
vapoursynthPlugins.tnlmeans
vapoursynthPlugins.ttempsmooth
vapoursynthPlugins.vivtc
# Requires non-redistributable unfree TensorRT.
# vapoursynthPlugins.vstrt
vapoursynthPlugins.wwxd
vapoursynthPlugins.znedi3
# vapoursynthPlugins.acsuite
vapoursynthPlugins.adjust
vapoursynthPlugins.astdr
# vapoursynthPlugins.awsmfunc
# vapoursynthPlugins.debandshit
vapoursynthPlugins.dfmderainbow
vapoursynthPlugins.edi_rpow2
vapoursynthPlugins.finedehalo
vapoursynthPlugins.fvsfunc
vapoursynthPlugins.havsfunc
vapoursynthPlugins.kagefunc
# vapoursynthPlugins.lvsfunc
vapoursynthPlugins.mt_lutspa
vapoursynthPlugins.muvsfunc
vapoursynthPlugins.mvsfunc
vapoursynthPlugins.nnedi3_resample
vapoursynthPlugins.nnedi3_rpow2
# vapoursynthPlugins.rekt
# vapoursynthPlugins.vardefunc
# vapoursynthPlugins.vsTAAmbk
# vapoursynthPlugins.vsgan
vapoursynthPlugins.vsutil
];
} "touch $out"

View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash
nix-build --show-trace --argstr vs-overlay $PWD test-build.nix
nix-build --show-trace --argstr vs-overlay $PWD everything-shell.nix