diff options
| author | Peter Simons <simons@cryp.to> | 2020-01-10 15:10:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-10 15:10:58 +0100 |
| commit | 6a36e65b4bb3aa766fb2766c607ee8fe17da7ddf (patch) | |
| tree | f0b105692949301ab57114affffe61ae0d316617 | |
| parent | f21a5ad683437c019fa448c6054908a843cc9f52 (diff) | |
| parent | 9e808578c419ac769556fb1e166db35f2cfb33e7 (diff) | |
| download | nixpkgs-6a36e65b4bb3aa766fb2766c607ee8fe17da7ddf.tar nixpkgs-6a36e65b4bb3aa766fb2766c607ee8fe17da7ddf.tar.gz nixpkgs-6a36e65b4bb3aa766fb2766c607ee8fe17da7ddf.tar.bz2 nixpkgs-6a36e65b4bb3aa766fb2766c607ee8fe17da7ddf.tar.lz nixpkgs-6a36e65b4bb3aa766fb2766c607ee8fe17da7ddf.tar.xz nixpkgs-6a36e65b4bb3aa766fb2766c607ee8fe17da7ddf.tar.zst nixpkgs-6a36e65b4bb3aa766fb2766c607ee8fe17da7ddf.zip | |
Merge pull request #77439 from aforemny/ormolu
Fix haskellPackages.ormolu
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7b06628dbc7..91e7e37825b 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 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ef6eada4c2d..0ba56de13f1 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 |