From 47ddee700f5f4c856d64542d9b5f32dd90e7b967 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 10 Jan 2020 14:50:09 +0100 Subject: [PATCH 1/2] haskellPackages.ormolu: fix overrides so it builds --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7b06628dbc7e..91e7e37825b7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1361,4 +1361,8 @@ self: super: { # https://github.com/haskell-servant/servant-ekg/issues/15 servant-ekg = doJailbreak super.servant-ekg; + # Needs ghc-lib-parser 8.8.1 (does not build with 8.8.0) + ormolu = doJailbreak (super.ormolu.override { + ghc-lib-parser = self.ghc-lib-parser_8_8_1_20191204; + }); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 9e808578c419ac769556fb1e166db35f2cfb33e7 Mon Sep 17 00:00:00 2001 From: Alexander Foremny Date: Fri, 10 Jan 2020 14:51:26 +0100 Subject: [PATCH 2/2] haskellPackages.ormolu: mark unbroken Builds fine with 6b5bb4261c6dacbe65d348376c416c75ddafaebd --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ef6eada4c2d6..0ba56de13f12 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7731,7 +7731,6 @@ broken-packages: - orgstat - origami - orizentic - - ormolu - OrPatterns - osc - oscpacking