ilyakooo0/ormolu
1
0
Fork 0
mirror of https://github.com/ilyakooo0/ormolu.git synced 2024-09-11 16:36:31 +03:00
Code Issues Projects Releases Wiki Activity
e7c080e2aa
ormolu/default.nix

123 lines
2.9 KiB
Nix
Raw Normal View History

Adjust the nix expression to facilitate importing from outside
2019-08-16 13:02:00 +03:00
{ pkgs ? (import ./nix/nixpkgs) }:
Clean nix configuration * Point to more recent nixpkgs commit. This fixes build issue with python 3.7.3 (only on darwin?). * Separate shell.nix and default.nix. This is so that lorri can be used for development. * Add nix output to .gitignore. * Format *.nix using nixfmt. * Use gitignore for filtering files in nix derivation.
2019-06-19 23:48:47 +03:00
let
Use GHC 8.6.5
2019-08-28 15:15:35 +03:00
ormoluCompiler = "ghc865";
A couple of minor changes in ‘default.nix’
2019-09-27 15:09:07 +03:00
source = pkgs.lib.sourceByRegex ./. [
Add nix expression for reformatting sources of arbitrary packages See the description in readme.
2019-07-14 02:01:02 +03:00
"^.*\.md$"
"^app.*$"
"^data.*$"
A couple of minor changes in ‘default.nix’
2019-09-27 15:09:07 +03:00
"^ormolu\.cabal$"
Add nix expression for reformatting sources of arbitrary packages See the description in readme.
2019-07-14 02:01:02 +03:00
"^src.*$"
"^tests.*$"
];
Adjust the nix expression to facilitate importing from outside
2019-08-16 13:02:00 +03:00
haskellPackages = pkgs.haskell.packages.${ormoluCompiler}.override {
overrides = ormoluOverlay;
Clean nix configuration * Point to more recent nixpkgs commit. This fixes build issue with python 3.7.3 (only on darwin?). * Separate shell.nix and default.nix. This is so that lorri can be used for development. * Add nix output to .gitignore. * Format *.nix using nixfmt. * Use gitignore for filtering files in nix derivation.
2019-06-19 23:48:47 +03:00
};
Adjust the nix expression to facilitate importing from outside
2019-08-16 13:02:00 +03:00
ormoluOverlay = self: super: {
Fix a typo and GHC warnings
2019-11-07 17:19:56 +03:00
"ormolu" = pkgs.haskell.lib.enableCabalFlag
(super.callCabal2nix "ormolu" source { }) "dev";
Migrate to ‘ghc-lib-parser’ This would let us have features from GHC 8.8.1 while still using GHC 8.6.5 from Nixpkgs. Bonus: Ormolu will be compilable with GHCJS.
2019-10-27 15:58:13 +03:00
# Nixpkgs provides ghc-lib-parser-8.8.0.20190424, but we want
Update ghc-lib-parser to 8.10.1 GHC 8.10.1 comes with some changes to the AST, which works great for Ormolu, but causes this commit to be a bit large: * Trees That Grow extension points for new constructors are now statically proven to be uninhabited, via noExtCon :: NoExtCon -> a. Thanks to this change I got rid of many notImplemented calls. * LPat constructor is now a lot more usable, so we don't need to use the locatedPat combinator and can remove some boilerplate code. Also it comes with ImportQualifiedPost and StandaloneKindSignatures we should support. I did not implement them in this commit, they'll be merged in later on. It causes one behaviour change, where the ordering of qualified and non-qualified imports of the same module is changed. This is due to our usage of gcompare resulting a different ordering because of the AST change caused by the ImportQualifiedPost extension. I think this is acceptable and we shouldn't try to keep backwards compatibility there. Another behaviour change is that previously HsExpr had a few extra constructors for arrows and patterns used in expression context. Those programs were syntactically incorrect, but refused on a later stage. But we nonetheless formatted those constructs so Ormolu didn't fail there while keeping the source code intact. However, now those constructors are removed, so Ormolu fails with a parse error in this case (same as GHC). I also removed some tests exhibiting this behaviour.
2020-03-29 00:32:04 +03:00
# ghc-lib-parser-8.10.1. We disable Haddock generation because it's way
Migrate to ‘ghc-lib-parser’ This would let us have features from GHC 8.8.1 while still using GHC 8.6.5 from Nixpkgs. Bonus: Ormolu will be compilable with GHCJS.
2019-10-27 15:58:13 +03:00
# too slow.
"ghc-lib-parser" = pkgs.haskell.lib.dontHaddock
Update ghc-lib-parser to 8.10.1 GHC 8.10.1 comes with some changes to the AST, which works great for Ormolu, but causes this commit to be a bit large: * Trees That Grow extension points for new constructors are now statically proven to be uninhabited, via noExtCon :: NoExtCon -> a. Thanks to this change I got rid of many notImplemented calls. * LPat constructor is now a lot more usable, so we don't need to use the locatedPat combinator and can remove some boilerplate code. Also it comes with ImportQualifiedPost and StandaloneKindSignatures we should support. I did not implement them in this commit, they'll be merged in later on. It causes one behaviour change, where the ordering of qualified and non-qualified imports of the same module is changed. This is due to our usage of gcompare resulting a different ordering because of the AST change caused by the ImportQualifiedPost extension. I think this is acceptable and we shouldn't try to keep backwards compatibility there. Another behaviour change is that previously HsExpr had a few extra constructors for arrows and patterns used in expression context. Those programs were syntactically incorrect, but refused on a later stage. But we nonetheless formatted those constructs so Ormolu didn't fail there while keeping the source code intact. However, now those constructors are removed, so Ormolu fails with a parse error in this case (same as GHC). I also removed some tests exhibiting this behaviour.
2020-03-29 00:32:04 +03:00
(super.callHackageDirect {
pkg = "ghc-lib-parser";
ver = "8.10.1.20200324";
sha256 = "0f2c68fzdj2lw6da2zpx7a0cx631im3kylwd85dzx1npsm1vzlbg";
} {});
Test a few Hackage packages on CI
2019-08-30 05:43:38 +03:00
};
Add nix expression for reformatting sources of arbitrary packages See the description in readme.
2019-07-14 02:01:02 +03:00
ormolize = import ./nix/ormolize {
inherit pkgs;
inherit haskellPackages;
};
Change the style of type signatures The commit changes how type signatures are printed. The new style looks like this: foo :: Int -> Char -> String This works better with foralls and other features of the type system that will be added in the near future, like linear arrows. In order to print Haddocks nicely (this seems to be the only acceptable placement): foo :: -- | First argument Int -> -- | Second argument Char -> -- | Result String It is often necessary to re-arrange them completely and use the “pipe style” instead of “caret style”. It proved to be a very hard task with our older comment-handling system, if not impossible. Here we start parsing Haddocks so that they are treated as components of AST and we now render them as part of rendering of those components. The existing framework for handling comments only prints non-Haddock comments now. The change caused a fair number of new problems and failures which I added new tests for.
2019-09-17 14:16:47 +03:00
# NOTE We have to exclude some directories for some packages because
# Ormolu needs files to be parsable by Haddock which is not always the
# case. For example some tests and examples do not parse.
excludedHackageDirs = {
"aws" = ["Examples"];
"distributed-process" = ["benchmarks"];
"esqueleto" = ["test"];
"fay" = ["examples"];
"postgrest" = ["test"];
};
Test a few Hackage packages on CI
2019-08-30 05:43:38 +03:00
ormolizedPackages = doCheck:
Change the style of type signatures The commit changes how type signatures are printed. The new style looks like this: foo :: Int -> Char -> String This works better with foralls and other features of the type system that will be added in the near future, like linear arrows. In order to print Haddocks nicely (this seems to be the only acceptable placement): foo :: -- | First argument Int -> -- | Second argument Char -> -- | Result String It is often necessary to re-arrange them completely and use the “pipe style” instead of “caret style”. It proved to be a very hard task with our older comment-handling system, if not impossible. Here we start parsing Haddocks so that they are treated as components of AST and we now render them as part of rendering of those components. The existing framework for handling comments only prints non-Haddock comments now. The change caused a fair number of new problems and failures which I added new tests for.
2019-09-17 14:16:47 +03:00
pkgs.lib.mapAttrs (name: p: ormolize {
package = p;
inherit doCheck;
excludedDirs =
if builtins.hasAttr name excludedHackageDirs
then excludedHackageDirs.${name}
else [];
}) haskellPackages;
Clean nix configuration * Point to more recent nixpkgs commit. This fixes build issue with python 3.7.3 (only on darwin?). * Separate shell.nix and default.nix. This is so that lorri can be used for development. * Add nix output to .gitignore. * Format *.nix using nixfmt. * Use gitignore for filtering files in nix derivation.
2019-06-19 23:48:47 +03:00
in {
ormolu = haskellPackages.ormolu;
Adjust the nix expression to facilitate importing from outside
2019-08-16 13:02:00 +03:00
ormoluShell = haskellPackages.shellFor {
Format Ormolu with Ormolu
2019-10-03 16:48:56 +03:00
packages = ps: [
ps.ormolu
];
buildInputs = [
haskellPackages.cabal-install
haskellPackages.ghcid
];
Clean nix configuration * Point to more recent nixpkgs commit. This fixes build issue with python 3.7.3 (only on darwin?). * Separate shell.nix and default.nix. This is so that lorri can be used for development. * Add nix output to .gitignore. * Format *.nix using nixfmt. * Use gitignore for filtering files in nix derivation.
2019-06-19 23:48:47 +03:00
};
Use Buildkite Replace CircleCI with Buildkite.
2020-02-10 16:46:13 +03:00
withOrmolu = haskellPackages.shellFor {
packages = ps: [];
buildInputs = [
haskellPackages.ormolu
];
};
Adjust the nix expression to facilitate importing from outside
2019-08-16 13:02:00 +03:00
inherit ormoluOverlay ormoluCompiler;
Test a few Hackage packages on CI
2019-08-30 05:43:38 +03:00
hackage = ormolizedPackages false;
hackageTests = with pkgs.lib; pkgs.recurseIntoAttrs (
let ps = [
"QuickCheck"
"ShellCheck"
"aeson"
"attoparsec"
Refactor the comment rendering code and ‘newline’ This removes (or rather puts it to a lower level) logic around “modifying newline” because it was very hard to reason about and almost blocked my work on fixing issue #337. I also dropped debugging output because it's too verbose and I'm not using it anyway. As part of these changes I also changed now the ‘newline’ combinator works. Now, similar to ‘space’, the second ‘newline’ in a row just tells the rendering engine to prefix next thing with a newline, using the ‘newline’ combinator more than twice in a row has no effect. To take full advantage of the new feature I also went through the code and simplified some logic around outputting exact amount of newlines because now it's harder to get things wrong, so we can be less careful with counting newlines.
2019-09-04 13:05:48 +03:00
"aws"
Enable checking ‘capability’ on CI
2019-09-16 12:00:22 +03:00
"capability"
Test a few Hackage packages on CI
2019-08-30 05:43:38 +03:00
"cassava"
"conduit"
"cryptonite"
"diagrams-core"
"distributed-process"
"esqueleto"
"fay"
Change the style of type signatures The commit changes how type signatures are printed. The new style looks like this: foo :: Int -> Char -> String This works better with foralls and other features of the type system that will be added in the near future, like linear arrows. In order to print Haddocks nicely (this seems to be the only acceptable placement): foo :: -- | First argument Int -> -- | Second argument Char -> -- | Result String It is often necessary to re-arrange them completely and use the “pipe style” instead of “caret style”. It proved to be a very hard task with our older comment-handling system, if not impossible. Here we start parsing Haddocks so that they are treated as components of AST and we now render them as part of rendering of those components. The existing framework for handling comments only prints non-Haddock comments now. The change caused a fair number of new problems and failures which I added new tests for.
2019-09-17 14:16:47 +03:00
"hakyll"
Refactor the comment rendering code and ‘newline’ This removes (or rather puts it to a lower level) logic around “modifying newline” because it was very hard to reason about and almost blocked my work on fixing issue #337. I also dropped debugging output because it's too verbose and I'm not using it anyway. As part of these changes I also changed now the ‘newline’ combinator works. Now, similar to ‘space’, the second ‘newline’ in a row just tells the rendering engine to prefix next thing with a newline, using the ‘newline’ combinator more than twice in a row has no effect. To take full advantage of the new feature I also went through the code and simplified some logic around outputting exact amount of newlines because now it's harder to get things wrong, so we can be less careful with counting newlines.
2019-09-04 13:05:48 +03:00
"haxl"
Test a few Hackage packages on CI
2019-08-30 05:43:38 +03:00
"hedgehog"
"hlint"
"megaparsec"
Refactor the comment rendering code and ‘newline’ This removes (or rather puts it to a lower level) logic around “modifying newline” because it was very hard to reason about and almost blocked my work on fixing issue #337. I also dropped debugging output because it's too verbose and I'm not using it anyway. As part of these changes I also changed now the ‘newline’ combinator works. Now, similar to ‘space’, the second ‘newline’ in a row just tells the rendering engine to prefix next thing with a newline, using the ‘newline’ combinator more than twice in a row has no effect. To take full advantage of the new feature I also went through the code and simplified some logic around outputting exact amount of newlines because now it's harder to get things wrong, so we can be less careful with counting newlines.
2019-09-04 13:05:48 +03:00
"ormolu"
Migrate to ‘ghc-lib-parser’ This would let us have features from GHC 8.8.1 while still using GHC 8.6.5 from Nixpkgs. Bonus: Ormolu will be compilable with GHCJS.
2019-10-27 15:58:13 +03:00
"optics"
Test a few Hackage packages on CI
2019-08-30 05:43:38 +03:00
"postgrest"
"servant"
"servant-server"
"tensorflow"
Handle operator chains better I implemented a custom logic where we assign a score to every occurance of an operator based on their location, and the average of that score determine the fixity of the operator. As you can imagine, the solution is a bit brittle; and it is easy to mislead it if you knowingly craft an input, but it gave acceptable results for every code snippet I found online. And since it returns the same AST no matter how we infer the fixities, it is not the end of the world if we infer something incorrectly. The code is not really optimised, and I think it has quadratic time complexity. Notably, we use opTreeLoc function quite often and it traverses the whole tree every time. Memoizing that on the OpBranch constructor would make formatting files with reeeally long operator chains a lot faster. We can do this once we decide to optimize for speed.
2019-09-04 09:33:58 +03:00
"text_1_2_4_0"
Enable checking the ‘tls’ package on CI
2019-09-06 20:22:15 +03:00
"tls"
Refactor the comment rendering code and ‘newline’ This removes (or rather puts it to a lower level) logic around “modifying newline” because it was very hard to reason about and almost blocked my work on fixing issue #337. I also dropped debugging output because it's too verbose and I'm not using it anyway. As part of these changes I also changed now the ‘newline’ combinator works. Now, similar to ‘space’, the second ‘newline’ in a row just tells the rendering engine to prefix next thing with a newline, using the ‘newline’ combinator more than twice in a row has no effect. To take full advantage of the new feature I also went through the code and simplified some logic around outputting exact amount of newlines because now it's harder to get things wrong, so we can be less careful with counting newlines.
2019-09-04 13:05:48 +03:00
"yesod-core"
Test a few Hackage packages on CI
2019-08-30 05:43:38 +03:00
# Comment idempotence issue
# "Agda"
# "brick"
# "hledger"
# "http-client"
# "idris"
# "intero"
# "leksah"
# "pandoc"
# "pipes"
# "stack"
# Missing language extension
# "lens" #fixed in master
# "purescript"
];
in listToAttrs (map (p: nameValuePair p (ormolizedPackages true).${p}) ps)
);
Clean nix configuration * Point to more recent nixpkgs commit. This fixes build issue with python 3.7.3 (only on darwin?). * Separate shell.nix and default.nix. This is so that lorri can be used for development. * Add nix output to .gitignore. * Format *.nix using nixfmt. * Use gitignore for filtering files in nix derivation.
2019-06-19 23:48:47 +03:00
}
Reference in New Issue Copy Permalink