public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fishPlugins.buildFishPlugin: rename checkFunctionPath parameter

Browse Source
This commit is contained in:
pacien 2021-01-11 03:39:57 +01:00
parent 165937d01e
commit 108fd69a8c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/builders/packages/fish.section.md
View File

@ -27,7 +27,7 @@ scripts from `$src/{completions,conf,conf.d,functions}` to the standard vendor
installation paths. It also sets up the test environment so that the optional installation paths. It also sets up the test environment so that the optional
`checkPhase` is executed in a Fish shell with other already packaged plugins `checkPhase` is executed in a Fish shell with other already packaged plugins
and package-local Fish functions specified in `checkPlugins` and and package-local Fish functions specified in `checkPlugins` and
`checkFunctionPath` respectively. `checkFunctionDirs` respectively.
See `pkgs/shells/fish/plugins/pure.nix` for an example of Fish plugin package See `pkgs/shells/fish/plugins/pure.nix` for an example of Fish plugin package
using `buildFishPlugin` and running unit tests with the `fishtape` test runner. using `buildFishPlugin` and running unit tests with the `fishtape` test runner.

4
pkgs/shells/fish/plugins/build-fish-plugin.nix
View File

@ -18,7 +18,7 @@ attrs@{
# plugin packages to add to the vendor paths of the test fish shell # plugin packages to add to the vendor paths of the test fish shell
checkPlugins ? [], checkPlugins ? [],
# vendor directories to add to the function path of the test fish shell # vendor directories to add to the function path of the test fish shell
checkFunctionPath ? [], checkFunctionDirs ? [],
# test script to be executed in a fish shell # test script to be executed in a fish shell
checkPhase ? "", checkPhase ? "",
doCheck ? checkPhase != "", doCheck ? checkPhase != "",
@ -57,7 +57,7 @@ stdenv.mkDerivation (attrs // {
checkInputs = [ (wrapFish { checkInputs = [ (wrapFish {
pluginPkgs = checkPlugins; pluginPkgs = checkPlugins;
functionDirs = checkFunctionPath; functionDirs = checkFunctionDirs;
}) ] ++ checkInputs; }) ] ++ checkInputs;
checkPhase = '' checkPhase = ''

2
pkgs/shells/fish/plugins/fishtape.nix
View File

@ -11,7 +11,7 @@ buildFishPlugin rec {
sha256 = "0dxcyhs2shhgy5xnwcimqja8vqsyk841x486lgq13i3y1h0kp2kd"; sha256 = "0dxcyhs2shhgy5xnwcimqja8vqsyk841x486lgq13i3y1h0kp2kd";
}; };
checkFunctionPath = [ "./" ]; # fishtape is introspective checkFunctionDirs = [ "./" ]; # fishtape is introspective
checkPhase = '' checkPhase = ''
rm test/tty.fish # test expects a tty rm test/tty.fish # test expects a tty
fishtape test/*.fish fishtape test/*.fish