git.iko.soy/ormolu
on master help sign in
Update nix pin, test with GHC 8.8.4
commit54d36fcc2cfb61d074a4f9035969eb3875325554 authorMark Karpov <markkarpov92@gmail.com> dateSat 22 Aug 2020, 22:48 (6 years ago) parent0b92af2
10 files changed+37−18
compare with master
unifiedsplit
.buildkite/pipeline.yml+2−2 default.nix+5−9 expected-failures/esqueleto.txt+1−1 expected-failures/hlint.txt+11 expected-failures/pandoc.txt+1−1 expected-failures/postgrest.txt+5 expected-failures/purescript.txt+2−2 expected-failures/tensorflow.txt+7 nix/nixpkgs/default.nix+2−2 ormolu.cabal+1−1
.buildkite/pipeline.yml+2−2
@@ -3,9 +3,9 @@ steps:
33 command: |
44 nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc865
55 timeout: 100
6− - label: Build and test with GHC 8.8.3
6+ - label: Build and test with GHC 8.8.4
77 command: |
8− nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc883
8+ nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc884
99 timeout: 100
1010 - label: Build and test with GHC 8.10.1
1111 command: |
default.nix+5−9
@@ -1,6 +1,6 @@
11{ pkgs ? (import ./nix/nixpkgs { inherit system; })
22, system ? builtins.currentSystem
3−, ormoluCompiler ? "ghc883" # the shell doesn't work with ghc8101 yet
3+, ormoluCompiler ? "ghc884" # the shell doesn't work with ghc8101 yet
44}:
55
66let
@@ -17,12 +17,6 @@ let
1717 };
1818 ormoluOverlay = self: super: {
1919 "ormolu" = super.callCabal2nixWithOptions "ormolu" source "-fdev" { };
20− "ghc-lib-parser" = pkgs.haskell.lib.dontHaddock
21− (super.callHackageDirect {
22− pkg = "ghc-lib-parser";
23− ver = "8.10.1.20200412";
24− sha256 = "sha256-EjMzp8xRT3xVFKDI1fAfopkylGB0hv35Av2+uZeETRU=";
25− } {});
2620 };
2721 ormolize = import ./nix/ormolize {
2822 inherit pkgs;
@@ -34,14 +28,16 @@ let
3428 "distributed-process"
3529 "esqueleto"
3630 "fay"
31+ "hlint"
3732 "idris"
3833 "intero"
3934 "leksah"
40− "lens"
4135 "pandoc"
4236 "pipes"
37+ "postgrest"
4338 "purescript"
44− ];
39+ "tensorflow"
40+ ] ++ (if ormoluCompiler == "ghc8101" then [] else ["lens"]);
4541 ormolizedPackages = doCheck:
4642 pkgs.lib.mapAttrs (name: p: ormolize {
4743 package = p;
expected-failures/esqueleto.txt+1−1
@@ -3,5 +3,5 @@ The GHC parser (in Haddock mode) failed:
33 lexical error in string/character literal at character 's'
44
55The GHC parser (in Haddock mode) failed:
6− test/PostgreSQL/Test.hs:510:9-41
6+ test/PostgreSQL/Test.hs:562:9-41
77 parse error on input `-- | Check the result is not null'
expected-failures/hlint.txtnew file+11
@@ -0,0 +1,11 @@
1+Formatting is not idempotent:
2+ src/Extension.hs<rendered>:19:22
3+ before: "DoRec , -} Recursive"
4+ after: "DoRec , -}\n "
5+Please, consider reporting the bug.
6+
7+Formatting is not idempotent:
8+ src/Hint/Bracket.hs<rendered>:249:50
9+ before: "\" x y [r]) {ideaSpan"
10+ after: "\" x y [r])\n "
11+Please, consider reporting the bug.
expected-failures/pandoc.txt+1−1
@@ -3,7 +3,7 @@ The GHC parser (in Haddock mode) failed:
33 parse error on input `import'
44
55Formatting is not idempotent:
6− src/Text/Pandoc/Readers/Vimwiki.hs<rendered>:615:19
6+ src/Text/Pandoc/Readers/Vimwiki.hs<rendered>:613:19
77 before: ".softbreak <$ endlin"
88 after: ".softbreak\n <$ en"
99Please, consider reporting the bug.
expected-failures/postgrest.txtnew file+5
@@ -0,0 +1,5 @@
1+Formatting is not idempotent:
2+ src/PostgREST/DbRequestBuilder.hs<rendered>:149:24
3+ before: " || -- clients"
4+ after: " || ( origin ="
5+Please, consider reporting the bug.
expected-failures/purescript.txt+2−2
@@ -1,10 +1,10 @@
11The GHC parser (in Haddock mode) failed:
2− src/Language/PureScript/AST/Declarations.hs:478:1-17
2+ src/Language/PureScript/AST/Declarations.hs:479:1-17
33 Invalid type signature: pattern ValueDecl :: ...
44Perhaps you meant to use PatternSynonyms?
55
66The GHC parser (in Haddock mode) failed:
7− src/Language/PureScript/AST/SourcePos.hs:101:1-22
7+ src/Language/PureScript/AST/SourcePos.hs:99:1-22
88 Invalid type signature: pattern NullSourceSpan :: ...
99Perhaps you meant to use PatternSynonyms?
1010
expected-failures/tensorflow.txtnew file+7
@@ -0,0 +1,7 @@
1+The GHC parser (in Haddock mode) failed:
2+ tensorflow-mnist/app/Main.hs:50:13-14
3+ parse error on input `->'
4+
5+The GHC parser (in Haddock mode) failed:
6+ tensorflow-ops/tests/RegressionTest.hs:3:1-6
7+ parse error on input `import'
nix/nixpkgs/default.nix+2−2
@@ -1,7 +1,7 @@
11{ system ? builtins.currentSystem }:
22let
3− rev = "807ca93fadd5197c2260490de0c76e500562dc05";
4− sha256 = "10yq8bnls77fh3pk5chkkb1sv5lbdgyk1rr2v9xn71rr1k2x563p";
3+ rev = "32b46dd897ab2143a609988a04d87452f0bbef59";
4+ sha256 = "1gzfrpjnr1bz9zljsyg3a4zrhk8r927sz761mrgcg56dwinkhpjk";
55 nixpkgs = builtins.fetchTarball {
66 url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
77 inherit sha256;
ormolu.cabal+1−1
@@ -4,7 +4,7 @@ version: 0.1.2.0
44license: BSD3
55license-file: LICENSE.md
66maintainer: Mark Karpov <mark.karpov@tweag.io>
7−tested-with: ghc ==8.6.5 ghc ==8.8.3 ghc ==8.10.1
7+tested-with: ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.1
88homepage: https://github.com/tweag/ormolu
99bug-reports: https://github.com/tweag/ormolu/issues
1010synopsis: A formatter for Haskell source code