From 1a451a36cbea25490ebf68679de98f7f4b051315 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge Date: Mon, 12 Mar 2018 02:25:19 +0300 Subject: [PATCH] ghc841: SMP-compatible regex-tdfa now on hackage --- .../configuration-ghc-8.4.x.nix | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 514ebfd7728..92d49f71a78 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -145,6 +145,16 @@ self: super: { ## free ==4.*, template-haskell >=2.4 && <2.13 lens = super.lens_4_16; + ## Needs bump to a versioned attribute + regex-tdfa = overrideCabal super.regex-tdfa_1_2_3 (drv: { + ## • No instance for (Semigroup (CharMap a)) + ## arising from the superclasses of an instance declaration + ## • In the instance declaration for ‘Monoid (CharMap a)’ + ## + ## error: while evaluating ‘overrideCabal’ at nixpkgs://pkgs/development/haskell-modules/lib.nix:37:24, called from /home/deepfire/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix:188:16: + editedCabalFile = null; + }); + ## Needs bump to a versioned attribute ## Setup: Encountered missing dependencies: ## doctest >=0.11.1 && <0.14 @@ -514,20 +524,6 @@ self: super: { libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-default haskell-src-exts lens monad-control prim-uniq reflection split template-haskell unbounded-delays ]); }); - ## Unmerged. PR: https://github.com/ChrisKuklewicz/regex-tdfa/pull/13 - regex-tdfa = overrideCabal super.regex-tdfa (drv: { - ## • No instance for (Semigroup (CharMap a)) - ## arising from the superclasses of an instance declaration - ## • In the instance declaration for ‘Monoid (CharMap a)’ - src = pkgs.fetchFromGitHub { - owner = "bgamari"; - repo = "regex-tdfa"; - rev = "34f4593a520176a917b74b8c7fcbbfbd72fb8178"; - sha256 = "1aiklvf08w1hx2jn9n3sm61mfvdx4fkabszkjliapih2yjpmi3hq"; - }; - jailbreak = true; - }); - ## Unmerged. PR: https://github.com/bos/text-format/pull/21 text-format = overrideCabal super.text-format (drv: { ## • No instance for (Semigroup Format)