git.iko.soy/typeable/nixpkgs
on master help sign in
ghc-8.0.2: add sphinx to inputs for documentation

Closes https://github.com/NixOS/nixpkgs/pull/21434.

commit527468209c66b53e37121e67edc39acadb6da9da authorLaverne Schrock <laverne@schrock.email> dateMon 26 Dec 2016, 08:15 (10 years ago) parent1a78981
2 files changed+3−2
compare with master
unifiedsplit
pkgs/development/compilers/ghc/8.0.2.nix+2−2 pkgs/top-level/haskell-packages.nix+1
pkgs/development/compilers/ghc/8.0.2.nix+2−2
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
2−, hscolour, patchutils
2+, hscolour, patchutils, sphinx
33}:
44
55let
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323
2424 patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;
2525
26− buildInputs = [ ghc perl hscolour ];
26+ buildInputs = [ ghc perl hscolour sphinx ];
2727
2828 enableParallelBuilding = true;
2929
pkgs/top-level/haskell-packages.nix+1
@@ -50,6 +50,7 @@ rec {
5050 ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec {
5151 bootPkgs = packages.ghc7103;
5252 inherit (bootPkgs) hscolour;
53+ sphinx = pkgs.python27Packages.sphinx;
5354 };
5455 ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
5556 bootPkgs = packages.ghc7103;