diff options
author | pacien <pacien.trangirard@pacien.net> | 2021-01-11 03:39:57 +0100 |
---|---|---|
committer | pacien <pacien.trangirard@pacien.net> | 2021-01-11 03:39:57 +0100 |
commit | 108fd69a8c40d4488c96fd275430b6638fed19df (patch) | |
tree | a66df3e39348675f8862a3a04d984ccae207b5b5 | |
parent | 165937d01ec18c80c6171fa44df054207efebe93 (diff) | |
download | nixpkgs-108fd69a8c40d4488c96fd275430b6638fed19df.tar nixpkgs-108fd69a8c40d4488c96fd275430b6638fed19df.tar.gz nixpkgs-108fd69a8c40d4488c96fd275430b6638fed19df.tar.bz2 nixpkgs-108fd69a8c40d4488c96fd275430b6638fed19df.tar.lz nixpkgs-108fd69a8c40d4488c96fd275430b6638fed19df.tar.xz nixpkgs-108fd69a8c40d4488c96fd275430b6638fed19df.tar.zst nixpkgs-108fd69a8c40d4488c96fd275430b6638fed19df.zip |
fishPlugins.buildFishPlugin: rename checkFunctionPath parameter
-rw-r--r-- | doc/builders/packages/fish.section.md | 2 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/build-fish-plugin.nix | 4 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/fishtape.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/builders/packages/fish.section.md b/doc/builders/packages/fish.section.md index 43956fc531b..3086bd68348 100644 --- a/doc/builders/packages/fish.section.md +++ b/doc/builders/packages/fish.section.md @@ -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 `checkPhase` is executed in a Fish shell with other already packaged plugins 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 using `buildFishPlugin` and running unit tests with the `fishtape` test runner. diff --git a/pkgs/shells/fish/plugins/build-fish-plugin.nix b/pkgs/shells/fish/plugins/build-fish-plugin.nix index 98e0912a33c..a52c5746492 100644 --- a/pkgs/shells/fish/plugins/build-fish-plugin.nix +++ b/pkgs/shells/fish/plugins/build-fish-plugin.nix @@ -18,7 +18,7 @@ attrs@{ # plugin packages to add to the vendor paths of the test fish shell checkPlugins ? [], # vendor directories to add to the function path of the test fish shell - checkFunctionPath ? [], + checkFunctionDirs ? [], # test script to be executed in a fish shell checkPhase ? "", doCheck ? checkPhase != "", @@ -57,7 +57,7 @@ stdenv.mkDerivation (attrs // { checkInputs = [ (wrapFish { pluginPkgs = checkPlugins; - functionDirs = checkFunctionPath; + functionDirs = checkFunctionDirs; }) ] ++ checkInputs; checkPhase = '' diff --git a/pkgs/shells/fish/plugins/fishtape.nix b/pkgs/shells/fish/plugins/fishtape.nix index 326ff61c417..82f2375d5e3 100644 --- a/pkgs/shells/fish/plugins/fishtape.nix +++ b/pkgs/shells/fish/plugins/fishtape.nix @@ -11,7 +11,7 @@ buildFishPlugin rec { sha256 = "0dxcyhs2shhgy5xnwcimqja8vqsyk841x486lgq13i3y1h0kp2kd"; }; - checkFunctionPath = [ "./" ]; # fishtape is introspective + checkFunctionDirs = [ "./" ]; # fishtape is introspective checkPhase = '' rm test/tty.fish # test expects a tty fishtape test/*.fish |