alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

haskell/hoogle.nix: make an empty packages list possible

Browse source 
Building hoogle environments with an empty list of packages threw a built-time
error. This was particularly confusing when giving e.g. `(hps: [hps.Cabal])`
which, since `Cabal` is set to `null` (because it’s a distribution package),
would have lead to the same error as an empty list.

It was not useful to throw an error at all, because sometimes one only wants to
build an environment for the distribution packages; also the default value for
packages wasn’t even a valid value, so it is removed.
This commit is contained in:
Profpatsch 2016-11-21 20:44:42 +01:00
parent 0c6b3a3647
commit b8a69aaba9
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/haskell-modules/hoogle.nix
View file

@ -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