ghc: Adding sphinx as build dependency to build man pages

Fixes https://github.com/NixOS/nixpkgs/issues/49627.
Closes https://github.com/NixOS/nixpkgs/pull/50920.
wip/yesman
Craig Younkins 6 years ago committed by Peter Simons
parent e1ad1a0aa2
commit a655fb9fbd
  1. 4
      pkgs/development/compilers/ghc/8.4.4.nix
  2. 4
      pkgs/development/compilers/ghc/8.6.1.nix
  3. 4
      pkgs/development/compilers/ghc/8.6.2.nix
  4. 2
      pkgs/development/compilers/ghc/head.nix
  5. 4
      pkgs/top-level/haskell-packages.nix

@ -2,7 +2,7 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
, libiconv ? null, ncurses
@ -183,7 +183,7 @@ stdenv.mkDerivation (rec {
strictDeps = true;
nativeBuildInputs = [
perl autoconf automake m4 python3
perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
];

@ -2,7 +2,7 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
, libiconv ? null, ncurses
@ -168,7 +168,7 @@ stdenv.mkDerivation (rec {
strictDeps = true;
nativeBuildInputs = [
perl autoconf automake m4 python3
perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
];

@ -2,7 +2,7 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
, libiconv ? null, ncurses
@ -168,7 +168,7 @@ stdenv.mkDerivation (rec {
strictDeps = true;
nativeBuildInputs = [
perl autoconf automake m4 python3
perl autoconf automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
];

@ -2,7 +2,7 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchgit, perl, python3, m4
, autoconf, automake, coreutils, fetchgit, perl, python3, m4, sphinx
, libiconv ? null, ncurses

@ -52,21 +52,25 @@ in {
};
ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix {
bootPkgs = packages.ghc822Binary;
inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5;
};
ghc861 = callPackage ../development/compilers/ghc/8.6.1.nix {
bootPkgs = packages.ghc822;
inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_6;
llvmPackages = pkgs.llvmPackages_6;
};
ghc862 = callPackage ../development/compilers/ghc/8.6.2.nix {
bootPkgs = packages.ghc822;
inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_6;
llvmPackages = pkgs.llvmPackages_6;
};
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc822Binary;
inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5;
};

Loading…
Cancel
Save