haskell.compiler.ghc961: init at 9.6.1#210973
Merged
sternenseemann merged 1 commit intoNixOS:haskell-updatesfrom Mar 12, 2023
Merged
haskell.compiler.ghc961: init at 9.6.1#210973sternenseemann merged 1 commit intoNixOS:haskell-updatesfrom
sternenseemann merged 1 commit intoNixOS:haskell-updatesfrom
Conversation
github-actions
bot
added
the
6.topic: haskell
maralorn
reviewed
Jan 15, 2023
Comment on lines
1
to
4
ofborg
bot
requested review from
cdepillabout,
expipiplus1,
guibou and
maralorn
ofborg
bot
added
11.by: package-maintainer
sternenseemann
force-pushed
the
ghc-9.6.1
branch
from
e4e6f8d to
0a568a4
Compare
Contributor
|
Thank you for this work. I've tested it and the compilers works perfectly. However, Initially, it fails because of: Looks like the diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 77ccd301b43..9aa326a8b5b 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -156,8 +156,8 @@ symlinkJoin {
# to another nix derivation, so they are not writable. Removing
# them allow the correct behavior of ghc-pkg recache
# See: https://github.com/NixOS/nixpkgs/issues/79441
- rm ${packageCfgDir}/package.cache.lock
- rm ${packageCfgDir}/package.cache
+ rm -f ${packageCfgDir}/package.cache.lock
+ rm -f ${packageCfgDir}/package.cache
$out/bin/${ghcCommand}-pkg recache
''}But now it fails with: (that's for one specific package db, the error may vary depending on the I'll try to investigate later, I wanted to report this breakage, but this does not block the merge of the compiler from my point of view. |
Member
Author
sternenseemann
commented
Feb 11, 2023
Member
Author
There was a problem hiding this comment.
need to check if this makes sense (also rts and hpc) – if they are not on hackage it's probably sensible to remove them here.
Contributor
|
I've rebased and applied the following diff: diff --git a/pkgs/development/compilers/ghc/9.6.1.nix b/pkgs/development/compilers/ghc/9.6.1.nix
index f9c9a4b1e6a..574ff88cf46 100644
--- a/pkgs/development/compilers/ghc/9.6.1.nix
+++ b/pkgs/development/compilers/ghc/9.6.1.nix
@@ -1,5 +1,5 @@
import ./common-hadrian.nix rec {
- version = "9.6.0.20230128";
- url = "https://downloads.haskell.org/~ghc/9.6.1-alpha2/ghc-${version}-src.tar.xz";
- sha256 = "531f58dc0e352987a637095c18252e5d6fef260969eb9cb3d8447888b0922da2";
+ version = "9.6.0.20230210";
+ url = "https://downloads.haskell.org/~ghc/9.6.1-alpha3/ghc-${version}-src.tar.xz";
+ sha256 = "sha256-3vSnSFFiJm6R70YA38yoQki+1kFHF91+66za2WogT0c=";
}For alpha 3 support. Unfortunately, I cannot push to your repo @sternenseemann so well, please accept this diff here ^^ |
sternenseemann
force-pushed
the
ghc-9.6.1
branch
2 times, most recently
from
63d7e40 to
b52426d
Compare
Member
Author
|
@guibou Thanks, did so on my branch as well. Also tested |
Contributor
|
This looks great! I've tried it out at Mercury and it works well. We can't quite get a full build working because a number of dependencies don't compile, I think mostly due to breaking changes in |
sternenseemann
force-pushed
the
ghc-9.6.1
branch
from
b52426d to
494f7e3
Compare
sternenseemann
force-pushed
the
ghc-9.6.1
branch
from
494f7e3 to
aca7682
Compare
sternenseemann
changed the title
xhtml seems to be built unconditionally now which is at least one thing improved by hadrian.
sternenseemann
force-pushed
the
ghc-9.6.1
branch
from
aca7682 to
e3b8b31
Compare
ofborg
bot
added
10.rebuild-darwin: 0
ofborg
bot
removed
the
10.rebuild-linux: 1-10
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
4 participants
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.
xhtml seems to be built unconditionally now which is at least one thing improved by hadrian.
Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes