Merge pull request #77439 from aforemny/ormolu

Fix haskellPackages.ormolu
NixOS · Jan 10, 2020 · 6a36e65 · 6a36e65
2 parents f21a5ad + 9e80857
commit 6a36e65
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
diff --git 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