Merged
Conversation
c7dde00 to
ecca531
Compare
ecca531 to
0c6b458
Compare
0c6b458 to
f3719e3
Compare
bb1c337 to
3314a86
Compare
|
what needs to happen for this PR to be ready for merge? is there anything I can help with? |
Member
|
Last time I looked GHC 9.14 wasn't available in |
Closed
It hasn't been merged, but it is almost ready: input-output-hk/haskell.nix#2434. I've been using that branch a bit for some other projects and, for what it's worth, it works here as long as we apply #1190: $ git diff ':!flake.lock'
diff --git a/cabal.project b/cabal.project
index d21ee74..ad64f2c 100644
--- a/cabal.project
+++ b/cabal.project
@@ -6,3 +6,7 @@ tests: True
multi-repl: True
constraints: ormolu +dev
+
+allow-newer:
+ *:template-haskell,
+ *:base,
diff --git a/flake.nix b/flake.nix
index 1491c7f..b541d88 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
{
inputs = {
haskellNix = {
- url = "github:input-output-hk/haskell.nix";
+ url = "github:input-output-hk/haskell.nix/hkm/ghc914X";
# prevent nix-direnv from fetching stackage
inputs.stackage.url = "github:input-output-hk/empty-flake";
};
@@ -23,7 +23,7 @@
inherit (pkgs) lib haskell-nix;
inherit (haskell-nix) haskellLib;
- ghcVersions = [ "ghc9102" "ghc9122" ];
+ ghcVersions = [ "ghc9102" "ghc9122" "ghc9141" ];
defaultGHCVersion = builtins.head ghcVersions;
perGHC = lib.genAttrs ghcVersions (ghcVersion:
let
@@ -136,13 +136,9 @@
};
};
devShells = {
- default = defaultGHC.dev.hsPkgs.shellFor {
+ default = perGHC.ghc9141.dev.hsPkgs.shellFor {
tools = {
cabal = "latest";
- haskell-language-server = {
- src = inputs.haskellNix.inputs."hls-2.11";
- configureArgs = "--disable-benchmarks --disable-tests";
- };
};
nativeBuildInputs = pre-commit-check.enabledPackages;
withHoogle = false;
diff --git a/ormolu.cabal b/ormolu.cabal
index 55ad299..1b2ba3f 100644
--- a/ormolu.cabal
+++ b/ormolu.cabal
@@ -167,7 +167,6 @@ executable ormolu
test-suite tests
type: exitcode-stdio-1.0
main-is: Spec.hs
- build-tool-depends: hspec-discover:hspec-discover >=2 && <3
hs-source-dirs: tests
other-modules:
Ormolu.CabalInfoSpec
$ nix develop --accept-flake-config
warning: Git tree '/home/gthomas/code/ormolu' is dirty
$ ghc -V
The Glorious Glasgow Haskell Compilation System, version 9.14.1
$ cabal run test:tests -- -f failed-examples
Finished in 2.2966 seconds
597 examples, 0 failures |
It has now! |
49c234e to
b7b1abc
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Draft until GHC 9.14.1 gets released
Update flake inputs and GHCs, bump
.cabalversion boundsAlso drop GHC 9.8 (which allows us to upgrade to GHC2024 in a follow-up PR).
Update to
ghc-lib-parser-9.14. See the changelog entry for new syntactic features.Update to
Cabal-syntax-3.16.Fix Strings containing
\^\escape sequence are misformatted #1165 (depends on an upstream GHC parser fix).