public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ghc-8.0.2: add sphinx to inputs for documentation

Browse Source 
Closes https://github.com/NixOS/nixpkgs/pull/21434.
This commit is contained in:
Laverne Schrock 2016-12-26 08:15:32 -06:00 committed by Peter Simons
parent 1a78981b2f
commit 527468209c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/ghc/8.0.2.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
, hscolour, patchutils , hscolour, patchutils, sphinx
}: }:
let let
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
buildInputs = [ ghc perl hscolour ]; buildInputs = [ ghc perl hscolour sphinx ];
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/top-level/haskell-packages.nix
View File

@ -50,6 +50,7 @@ rec {
ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec { ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec {
bootPkgs = packages.ghc7103; bootPkgs = packages.ghc7103;
inherit (bootPkgs) hscolour; inherit (bootPkgs) hscolour;
sphinx = pkgs.python27Packages.sphinx;
}; };
ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
bootPkgs = packages.ghc7103; bootPkgs = packages.ghc7103;