1
1
mirror of https://github.com/google/ormolu.git synced 2024-10-26 08:31:36 +03:00

Update nix pin, test with GHC 8.10.2

This commit is contained in:
Mark Karpov 2020-10-12 20:57:00 +02:00
parent 5a5a23459c
commit f896262aee
6 changed files with 9 additions and 9 deletions

View File

@ -7,9 +7,9 @@ steps:
command: |
nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc884
timeout: 100
- label: Build and test with GHC 8.10.1
- label: Build and test with GHC 8.10.2
command: |
nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc8101
nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc8102
timeout: 100
- wait
- label: Check formatting

View File

@ -1,6 +1,6 @@
{ pkgs ? (import ./nix/nixpkgs { inherit system; })
, system ? builtins.currentSystem
, ormoluCompiler ? "ghc884" # the shell doesn't work with ghc8101 yet
, ormoluCompiler ? "ghc8102"
}:
let
@ -37,7 +37,7 @@ let
"postgrest"
"purescript"
"tensorflow"
] ++ (if ormoluCompiler == "ghc8101" then [] else ["lens"]);
] ++ (if ormoluCompiler == "ghc8102" then [] else ["lens"]);
ormolizedPackages = doCheck:
pkgs.lib.mapAttrs (name: p: ormolize {
package = p;

View File

@ -1,5 +1,5 @@
The GHC parser (in Haddock mode) failed:
src/Database/Esqueleto/Internal/Internal.hs:379:1
src/Database/Esqueleto/Internal/Internal.hs:385:1
lexical error in string/character literal at character 's'
The GHC parser (in Haddock mode) failed:

View File

@ -3,7 +3,7 @@ The GHC parser (in Haddock mode) failed:
parse error on input `import'
Formatting is not idempotent:
src/Text/Pandoc/Readers/Vimwiki.hs<rendered>:613:19
src/Text/Pandoc/Readers/Vimwiki.hs<rendered>:617:19
before: ".softbreak <$ endlin"
after: ".softbreak\n <$ en"
Please, consider reporting the bug.

View File

@ -1,7 +1,7 @@
{ system ? builtins.currentSystem }:
let
rev = "32b46dd897ab2143a609988a04d87452f0bbef59";
sha256 = "1gzfrpjnr1bz9zljsyg3a4zrhk8r927sz761mrgcg56dwinkhpjk";
rev = "84d74ae9c9cbed73274b8e4e00be14688ffc93fe";
sha256 = "0ww70kl08rpcsxb9xdx8m48vz41dpss4hh3vvsmswll35l158x0v";
nixpkgs = builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
inherit sha256;

View File

@ -4,7 +4,7 @@ version: 0.1.3.0
license: BSD3
license-file: LICENSE.md
maintainer: Mark Karpov <mark.karpov@tweag.io>
tested-with: ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.1
tested-with: ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.2
homepage: https://github.com/tweag/ormolu
bug-reports: https://github.com/tweag/ormolu/issues
synopsis: A formatter for Haskell source code