From accaa8790c82daf2db555351f0088fa1449fb5eb Mon Sep 17 00:00:00 2001 From: Aycan Irican Date: Sat, 23 May 2020 23:37:41 -0700 Subject: [PATCH] guid: fix compilation of Setup.hs and disable tests guid: fix compilation of Setup.hs and disable tests Add more docs Remove guid from broken-packages --- .../haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4798f99e2f03..a57c9eaa516f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5324,7 +5324,6 @@ broken-packages: - gtksourceview3 - guarded-rewriting - guess-combinator - - guid - GuiHaskell - GuiTV - gulcii diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 2487ea8b07a9..5bf21e1d1d0a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -761,4 +761,12 @@ self: super: builtins.intersectAttrs super { rebase_1_6_1 = super.rebase_1_6_1.override { selective = super.selective_0_4_1; }; + + # Fix compilation of Setup.hs by removing the module declaration. + # See: https://github.com/tippenein/guid/issues/1 + guid = overrideCabal (super.guid) (drv: { + prePatch = "sed -i '1d' Setup.hs"; # 1st line is module declaration, remove it + doCheck = false; + }); + }