summary refs log tree commit diff
path: root/pkgs/top-level/haskell-packages.nix
diff options
context:
space:
mode:
authorArtem Pyanykh <artem.pyanykh@gmail.com>2019-02-13 15:28:10 +0300
committerPeter Simons <simons@cryp.to>2019-02-27 21:08:49 +0100
commitf7003e5390caa75b77feca066a576b34f986d1c5 (patch)
tree95de7ff6163f839016c54d3d2b160836bcae5dab /pkgs/top-level/haskell-packages.nix
parentcab4a718deeba06d9b1dd10292fab5de5a847f0b (diff)
downloadnixpkgs-f7003e5390caa75b77feca066a576b34f986d1c5.tar
nixpkgs-f7003e5390caa75b77feca066a576b34f986d1c5.tar.gz
nixpkgs-f7003e5390caa75b77feca066a576b34f986d1c5.tar.bz2
nixpkgs-f7003e5390caa75b77feca066a576b34f986d1c5.tar.lz
nixpkgs-f7003e5390caa75b77feca066a576b34f986d1c5.tar.xz
nixpkgs-f7003e5390caa75b77feca066a576b34f986d1c5.tar.zst
nixpkgs-f7003e5390caa75b77feca066a576b34f986d1c5.zip
ghc-8.4.4: use sphinx 1.7.x to build the documentation
ghc-8.4.4 requires sphinx < 1.8, otherwise build fails on haddock with:

    Extension error: The 'ghc-flag' directive is already registered to domain std

Also fixed evaluation errors in configurations of ghc-8.2.x and ghc-8.4.x.

Closes https://github.com/NixOS/nixpkgs/pull/55703.
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r--pkgs/top-level/haskell-packages.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 3e59bf872d5..a2f392fb109 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -55,7 +55,7 @@ in {
     };
     ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix {
       bootPkgs = packages.ghc822Binary;
-      sphinx = null;            # broken with sphinx 1.8.x
+      sphinx = buildPackages.python3Packages.sphinx_1_7_9;
       buildLlvmPackages = buildPackages.llvmPackages_5;
       llvmPackages = pkgs.llvmPackages_5;
     };