diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-04 00:05:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-04 00:05:27 +0000 |
| commit | 015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52 (patch) | |
| tree | 20bb8c5ba39bdb13cf39cfc3b6e048fa2ed0f8a4 /pkgs/development/haskell-modules | |
| parent | 2597ed803aef52f39c4a16a188a3708bd3d2883b (diff) | |
| parent | 06607de5331dbe957cd626b8912f4d7ecef04fa8 (diff) | |
| download | nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.tar nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.tar.gz nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.tar.bz2 nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.tar.lz nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.tar.xz nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.tar.zst nixpkgs-015c6d73ada8ee0b05d723a08a5f2c7db9ce8e52.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 5bf9f460acf..e76f5012f95 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -53,6 +53,7 @@ in , enableParallelBuilding ? true , maintainers ? null , changelog ? null +, mainProgram ? null , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} @@ -666,6 +667,7 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; } // optionalAttrs (args ? badPlatforms) { inherit badPlatforms; } // optionalAttrs (args ? changelog) { inherit changelog; } + // optionalAttrs (args ? mainProgram) { inherit mainProgram; } ; } |