mirror of
https://github.com/tweag/ormolu.git
synced 2024-09-17 16:17:14 +03:00
Update nix pin, test with GHC 8.8.4
This commit is contained in:
parent
0b92af2a7f
commit
54d36fcc2c
@ -3,9 +3,9 @@ steps:
|
||||
command: |
|
||||
nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc865
|
||||
timeout: 100
|
||||
- label: Build and test with GHC 8.8.3
|
||||
- label: Build and test with GHC 8.8.4
|
||||
command: |
|
||||
nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc883
|
||||
nix-build --keep-going --no-out-link --argstr ormoluCompiler ghc884
|
||||
timeout: 100
|
||||
- label: Build and test with GHC 8.10.1
|
||||
command: |
|
||||
|
14
default.nix
14
default.nix
@ -1,6 +1,6 @@
|
||||
{ pkgs ? (import ./nix/nixpkgs { inherit system; })
|
||||
, system ? builtins.currentSystem
|
||||
, ormoluCompiler ? "ghc883" # the shell doesn't work with ghc8101 yet
|
||||
, ormoluCompiler ? "ghc884" # the shell doesn't work with ghc8101 yet
|
||||
}:
|
||||
|
||||
let
|
||||
@ -17,12 +17,6 @@ let
|
||||
};
|
||||
ormoluOverlay = self: super: {
|
||||
"ormolu" = super.callCabal2nixWithOptions "ormolu" source "-fdev" { };
|
||||
"ghc-lib-parser" = pkgs.haskell.lib.dontHaddock
|
||||
(super.callHackageDirect {
|
||||
pkg = "ghc-lib-parser";
|
||||
ver = "8.10.1.20200412";
|
||||
sha256 = "sha256-EjMzp8xRT3xVFKDI1fAfopkylGB0hv35Av2+uZeETRU=";
|
||||
} {});
|
||||
};
|
||||
ormolize = import ./nix/ormolize {
|
||||
inherit pkgs;
|
||||
@ -34,14 +28,16 @@ let
|
||||
"distributed-process"
|
||||
"esqueleto"
|
||||
"fay"
|
||||
"hlint"
|
||||
"idris"
|
||||
"intero"
|
||||
"leksah"
|
||||
"lens"
|
||||
"pandoc"
|
||||
"pipes"
|
||||
"postgrest"
|
||||
"purescript"
|
||||
];
|
||||
"tensorflow"
|
||||
] ++ (if ormoluCompiler == "ghc8101" then [] else ["lens"]);
|
||||
ormolizedPackages = doCheck:
|
||||
pkgs.lib.mapAttrs (name: p: ormolize {
|
||||
package = p;
|
||||
|
@ -3,5 +3,5 @@ The GHC parser (in Haddock mode) failed:
|
||||
lexical error in string/character literal at character 's'
|
||||
|
||||
The GHC parser (in Haddock mode) failed:
|
||||
test/PostgreSQL/Test.hs:510:9-41
|
||||
test/PostgreSQL/Test.hs:562:9-41
|
||||
parse error on input `-- | Check the result is not null'
|
||||
|
11
expected-failures/hlint.txt
Normal file
11
expected-failures/hlint.txt
Normal file
@ -0,0 +1,11 @@
|
||||
Formatting is not idempotent:
|
||||
src/Extension.hs<rendered>:19:22
|
||||
before: "DoRec , -} Recursive"
|
||||
after: "DoRec , -}\n "
|
||||
Please, consider reporting the bug.
|
||||
|
||||
Formatting is not idempotent:
|
||||
src/Hint/Bracket.hs<rendered>:249:50
|
||||
before: "\" x y [r]) {ideaSpan"
|
||||
after: "\" x y [r])\n "
|
||||
Please, consider reporting the bug.
|
@ -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>:615:19
|
||||
src/Text/Pandoc/Readers/Vimwiki.hs<rendered>:613:19
|
||||
before: ".softbreak <$ endlin"
|
||||
after: ".softbreak\n <$ en"
|
||||
Please, consider reporting the bug.
|
||||
|
5
expected-failures/postgrest.txt
Normal file
5
expected-failures/postgrest.txt
Normal file
@ -0,0 +1,5 @@
|
||||
Formatting is not idempotent:
|
||||
src/PostgREST/DbRequestBuilder.hs<rendered>:149:24
|
||||
before: " || -- clients"
|
||||
after: " || ( origin ="
|
||||
Please, consider reporting the bug.
|
@ -1,10 +1,10 @@
|
||||
The GHC parser (in Haddock mode) failed:
|
||||
src/Language/PureScript/AST/Declarations.hs:478:1-17
|
||||
src/Language/PureScript/AST/Declarations.hs:479:1-17
|
||||
Invalid type signature: pattern ValueDecl :: ...
|
||||
Perhaps you meant to use PatternSynonyms?
|
||||
|
||||
The GHC parser (in Haddock mode) failed:
|
||||
src/Language/PureScript/AST/SourcePos.hs:101:1-22
|
||||
src/Language/PureScript/AST/SourcePos.hs:99:1-22
|
||||
Invalid type signature: pattern NullSourceSpan :: ...
|
||||
Perhaps you meant to use PatternSynonyms?
|
||||
|
||||
|
7
expected-failures/tensorflow.txt
Normal file
7
expected-failures/tensorflow.txt
Normal file
@ -0,0 +1,7 @@
|
||||
The GHC parser (in Haddock mode) failed:
|
||||
tensorflow-mnist/app/Main.hs:50:13-14
|
||||
parse error on input `->'
|
||||
|
||||
The GHC parser (in Haddock mode) failed:
|
||||
tensorflow-ops/tests/RegressionTest.hs:3:1-6
|
||||
parse error on input `import'
|
@ -1,7 +1,7 @@
|
||||
{ system ? builtins.currentSystem }:
|
||||
let
|
||||
rev = "807ca93fadd5197c2260490de0c76e500562dc05";
|
||||
sha256 = "10yq8bnls77fh3pk5chkkb1sv5lbdgyk1rr2v9xn71rr1k2x563p";
|
||||
rev = "32b46dd897ab2143a609988a04d87452f0bbef59";
|
||||
sha256 = "1gzfrpjnr1bz9zljsyg3a4zrhk8r927sz761mrgcg56dwinkhpjk";
|
||||
nixpkgs = builtins.fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
|
||||
inherit sha256;
|
||||
|
@ -4,7 +4,7 @@ version: 0.1.2.0
|
||||
license: BSD3
|
||||
license-file: LICENSE.md
|
||||
maintainer: Mark Karpov <mark.karpov@tweag.io>
|
||||
tested-with: ghc ==8.6.5 ghc ==8.8.3 ghc ==8.10.1
|
||||
tested-with: ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.1
|
||||
homepage: https://github.com/tweag/ormolu
|
||||
bug-reports: https://github.com/tweag/ormolu/issues
|
||||
synopsis: A formatter for Haskell source code
|
||||
|
Loading…
Reference in New Issue
Block a user