From 527468209c66b53e37121e67edc39acadb6da9da Mon Sep 17 00:00:00 2001 From: Laverne Schrock Date: Mon, 26 Dec 2016 08:15:32 -0600 Subject: [PATCH] ghc-8.0.2: add sphinx to inputs for documentation Closes https://github.com/NixOS/nixpkgs/pull/21434. --- pkgs/development/compilers/ghc/8.0.2.nix | 4 ++-- pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 977a0fb39b6..b2ae92e02c6 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, hscolour, patchutils +, hscolour, patchutils, sphinx }: let @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; - buildInputs = [ ghc perl hscolour ]; + buildInputs = [ ghc perl hscolour sphinx ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 59c737dce6d..f229fb8a35c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -50,6 +50,7 @@ rec { ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) hscolour; + sphinx = pkgs.python27Packages.sphinx; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc7103;