From 8a02fa477f7ae58061f5d53060dc9f36f1e53d2a Mon Sep 17 00:00:00 2001 From: Marco Perone Date: Wed, 31 Jul 2019 16:46:47 +0200 Subject: build-idris-package: add options for idris commands --- pkgs/development/idris-modules/build-idris-package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index c67d53f8d9c2..2ae1d55258b8 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -7,6 +7,10 @@ , version , ipkgName ? name , extraBuildInputs ? [] + , idrisBuildOptions ? [] + , idrisTestOptions ? [] + , idrisInstallOptions ? [] + , idrisDocOptions ? [] , ... }@attrs: let @@ -39,14 +43,14 @@ stdenv.mkDerivation ({ buildPhase = '' runHook preBuild - idris --build ${ipkgName}.ipkg + idris --build ${ipkgName}.ipkg ${lib.escapeShellArgs idrisBuildOptions} runHook postBuild ''; checkPhase = '' runHook preCheck if grep -q tests ${ipkgName}.ipkg; then - idris --testpkg ${ipkgName}.ipkg + idris --testpkg ${ipkgName}.ipkg ${lib.escapeShellArgs idrisTestOptions} fi runHook postCheck ''; @@ -54,9 +58,9 @@ stdenv.mkDerivation ({ installPhase = '' runHook preInstall - idris --install ${ipkgName}.ipkg --ibcsubdir $out/libs + idris --install ${ipkgName}.ipkg --ibcsubdir $out/libs ${lib.escapeShellArgs idrisInstallOptions} - IDRIS_DOC_PATH=$out/doc idris --installdoc ${ipkgName}.ipkg || true + IDRIS_DOC_PATH=$out/doc idris --installdoc ${ipkgName}.ipkg ${lib.escapeShellArgs idrisDocOptions} || true # If the ipkg file defines an executable, install that executable=$(grep -Po '^executable = \K.*' ${ipkgName}.ipkg || true) -- cgit 1.4.1 From 349a843ef413f9746ce97625328670451d5574c0 Mon Sep 17 00:00:00 2001 From: Marco Perone Date: Wed, 31 Jul 2019 17:15:06 +0200 Subject: build-idris-package: add documentation on idris commands options --- doc/languages-frameworks/idris.section.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md index 3025172b5c98..e88015f08e3f 100644 --- a/doc/languages-frameworks/idris.section.md +++ b/doc/languages-frameworks/idris.section.md @@ -124,3 +124,21 @@ in another file (say `default.nix`) to be able to build it with ``` $ nix-build -A yaml ``` + +## Passing options to `idris` commands + +The `build-idris-package` function provides also optional input values to set additional options for the used `idris` commands. + +Specifically, you can set `idrisBuildOptions`, `idrisTestOptions`, `idrisInstallOptions` and `idrisDocOptions` to provide additional options to the `idris` command respectively when building, testing, installing and generating docs for your package. + +For example you could set + +``` +build-idris-package { + idrisBuildOptions = [ "--log" "1" "--verbose" ] + + ... +} +``` + +to require verbose output during `idris` build phase. -- cgit 1.4.1