From a655fb9fbd0d96c3cef342069bfa17041f2c20f6 Mon Sep 17 00:00:00 2001 From: Craig Younkins Date: Thu, 22 Nov 2018 04:51:57 +0000 Subject: [PATCH] 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. --- pkgs/development/compilers/ghc/8.4.4.nix | 4 ++-- pkgs/development/compilers/ghc/8.6.1.nix | 4 ++-- pkgs/development/compilers/ghc/8.6.2.nix | 4 ++-- pkgs/development/compilers/ghc/head.nix | 2 +- pkgs/top-level/haskell-packages.nix | 4 ++++ 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 139457f43c8..c84ea1d84d5 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.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 ]; diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 911a900f6d2..434570fe988 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.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 @@ -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 ]; diff --git a/pkgs/development/compilers/ghc/8.6.2.nix b/pkgs/development/compilers/ghc/8.6.2.nix index 5e263fd06b4..85853e15832 100644 --- a/pkgs/development/compilers/ghc/8.6.2.nix +++ b/pkgs/development/compilers/ghc/8.6.2.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 @@ -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 ]; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index bd02daf5e1c..29de668767b 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -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 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 21f3b277339..357ab21fba1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -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; };