diff options
author | Peter Simons <simons@cryp.to> | 2016-11-25 19:21:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-25 19:21:23 +0100 |
commit | baea6a8d824c3ac4b1a32f43fa1987090a7bf08d (patch) | |
tree | 5f9fefc13cdeae8fc7f0cfd1d28b523c4b87deca | |
parent | 9f9f7a35aa3912ad4f608a74589cd6f7a026d152 (diff) | |
parent | b8a69aaba97f8abdd0de735ac84d6da6e91ab165 (diff) | |
download | nixlib-baea6a8d824c3ac4b1a32f43fa1987090a7bf08d.tar nixlib-baea6a8d824c3ac4b1a32f43fa1987090a7bf08d.tar.gz nixlib-baea6a8d824c3ac4b1a32f43fa1987090a7bf08d.tar.bz2 nixlib-baea6a8d824c3ac4b1a32f43fa1987090a7bf08d.tar.lz nixlib-baea6a8d824c3ac4b1a32f43fa1987090a7bf08d.tar.xz nixlib-baea6a8d824c3ac4b1a32f43fa1987090a7bf08d.tar.zst nixlib-baea6a8d824c3ac4b1a32f43fa1987090a7bf08d.zip |
Merge pull request #20619 from Profpatsch/ghcWithHoogle-empty-packagelist
haskell/hoogle.nix: make an empty packages list possible
-rw-r--r-- | pkgs/development/haskell-modules/hoogle.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index bf7fd18f820a..a0b909628297 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -23,8 +23,8 @@ # This will build mmorph and monadControl, and have the hoogle installation # refer to their documentation via symlink so they are not garbage collected. -{ lib, stdenv, hoogle, writeText -, ghc, packages ? [ ghc.ghc ] +{ lib, stdenv, hoogle, writeText, ghc +, packages }: let @@ -51,6 +51,9 @@ let else writeText "ghcjs-prologue.txt" '' This index includes documentation for many Haskell modules. ''; + + docPackages = lib.closePropagation packages; + in stdenv.mkDerivation { name = "hoogle-local-0.1"; @@ -58,14 +61,9 @@ stdenv.mkDerivation { phases = [ "buildPhase" ]; - docPackages = (lib.closePropagation packages); + inherit docPackages; buildPhase = '' - if [ -z "$docPackages" ]; then - echo "ERROR: The packages attribute has not been set" - exit 1 - fi - mkdir -p $out/share/doc/hoogle echo importing builtin packages |