Open
Conversation
e0c3a9f to
bc4cbf1
Compare
bc4cbf1 to
5b1b746
Compare
cb04227 to
80d8721
Compare
christiaanb
reviewed
Apr 26, 2025
Member
|
Could you add 9.12 to the README in the GHC compatibility section as part of this PR? |
141df71 to
6958d7e
Compare
b405087 to
068d553
Compare
Merged
5dc8c10 to
c6c19b6
Compare
6a3c8d8 to
70aa037
Compare
70aa037 to
95fdaf1
Compare
Member
|
with --- a/flake.nix
+++ b/flake.nix
@@ -36,7 +36,7 @@
# The versions of GHC that we want to be able to build / develop against
# within the nix environment. Since nix is lazy, only derivations for
# versions of GHC which are used are actually evaluated.
- ghcVersions = [ "ghc967" "ghc984" "ghc9103" ];
+ ghcVersions = [ "ghc967" "ghc984" "ghc9103" "ghc9124" ];
# We pick a single version of GHC to use by default within nix. This is
# probably cleaner than always having N copies of each package / app and
--- a/nix/devshell.nix
+++ b/nix/devshell.nix
@@ -21,7 +21,7 @@ pkgs.mkShell {
buildInputs = [
clashPkgs.cabal-install
- clashPkgs.haskell-language-server
+ #clashPkgs.haskell-language-server
# https://discourse.nixos.org/t/non-interactive-bash-errors-from-flake-nix-mkshell/33310
pkgs.bashInteractive
--- a/nix/overlay-ghc912.nix
+++ b/nix/overlay-ghc912.nix
@@ -11,6 +11,15 @@ in
# brick 0.70.1 requires vty < 6.0.
vty = doJailbreak (prev.callHackage "vty" "5.39" { });
+ # the selected defaults do not build with GHC 9.12.4
+ th-desugar = doJailbreak (prev.callHackage "th-desugar" "1.19" { });
+ singletons-th = doJailbreak (prev.callHackage "singletons-th" "3.5.1" { });
+ singletons-base = dontCheck (doJailbreak (prev.callHackage "singletons-base" "3.5" { }));
+ singletons-base-code-generator = markUnbroken prev.singletons-base-code-generator;
+ cabal-add = dontCheck prev.cabal-add;
+ statistics = dontCheck prev.statistics;
+ fourmolu = dontCheck prev.fourmolu;
+
# Marked as broken in nixpkgs, since it specifies much older dependencies
# than the defaults in nixpkgs.
rewrite-inspector = doJailbreak (markUnbroken prev.rewrite-inspector);Where I had to disable HLS, because one of it's dependencies I recommend to add these changes as part of this PR as well. |
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.
Closes #2930
Still TODO:
Check copyright notices are up to date in edited filesFix issues exposed withcabal run -- clash-testsuite -p VACC -p VHDL -p clashDo not passdepstomkUnivCoghc-typelits-natnormalise#88cabal run -- clash-testsuite -p Numbers -p Strictnewtypefor any GHC version?Add source for GHC 9.12 executablecommit{-# OPTIONS_GHC -Wno-deprecations #-}fromclash-ghc/src-ghc/Clash/GHC/Util.hs9.12.39.12.4