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

ghc: Adding sphinx as build dependency to build man pages

Browse Source 
Fixes https://github.com/NixOS/nixpkgs/issues/49627.
Closes https://github.com/NixOS/nixpkgs/pull/50920.
This commit is contained in:
Craig Younkins 2018-11-22 04:51:57 +00:00 committed by Peter Simons
parent e1ad1a0aa2
commit a655fb9fbd
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

2
pkgs/development/compilers/ghc/head.nix
View File

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

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

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