From be23568daac69331f1f78b9c20b780f575ed2acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?RFish=20=E2=9A=93?= Date: Mon, 26 Jun 2017 18:01:56 +0200 Subject: [PATCH] hackage2nix: use older version of apply-refact with ghc-8.0.x Version 0.4 of apply-refact doesn't compile with GHC 8.0.x. This patch updates configurations-ghc-8.0.x to use apply-refact version 0.3.0.1. Closes https://github.com/NixOS/nixpkgs/pull/26896. Fixes https://github.com/NixOS/nixpkgs/issues/26895. --- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 ++ pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index e82e10edc58..83efa6b0b5a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -58,4 +58,6 @@ self: super: { # https://github.com/nominolo/ghc-syb/issues/20 ghc-syb-utils = dontCheck super.ghc-syb-utils; + # Newer versions require ghc>=8.2 + apply-refact = super.apply-refact_0_3_0_1; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fa4b5291e6b..c3a33e73f77 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2432,6 +2432,7 @@ extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier - aeson < 1 # required by liquidhaskell-0.8.0.0 - aeson-pretty < 0.8 # required by elm compiler + - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - Cabal == 1.18.* # required for cabal-install et al on old GHC versions @@ -2793,7 +2794,6 @@ dont-distribute-packages: applicative-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-quoters: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-splice: [ i686-linux, x86_64-linux, x86_64-darwin ] - apply-refact: [ i686-linux, x86_64-linux, x86_64-darwin ] ApproxFun-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] approximate: [ i686-linux, x86_64-linux, x86_64-darwin ] approx-rand-test: [ i686-linux, x86_64-linux, x86_64-darwin ]