Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix -inplace issue with ghc 9.8.1 boot packages #2161

Closed
wants to merge 18 commits into from
Closed

Fix -inplace issue with ghc 9.8.1 boot packages #2161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
104c430
Use reinstallableLibGhc for ghc 9.8.1 plugin test
hamishmack Feb 14, 2024
9a36a27
Try +hash-unit-ids
hamishmack Feb 15, 2024
9cd8cea
Try --hash-unit-ids
hamishmack Feb 15, 2024
f12958d
Remove `-inplace` from package ids
hamishmack Feb 15, 2024
5dc743d
Remove `-inplace` from package ids
hamishmack Feb 15, 2024
c11986d
Remove `-inplace` from package ids
hamishmack Feb 15, 2024
fe0ad63
ifdLevel 1
hamishmack Feb 15, 2024
b7ae376
ifdLevel 2
hamishmack Feb 15, 2024
9141d74
Remove `-inplace` from package ids
hamishmack Feb 15, 2024
a6e1f77
Remove `-inplace` from package ids
hamishmack Feb 15, 2024
bf311f2
Remove `-inplace` from package ids
hamishmack Feb 15, 2024
2149932
Remove `-inplace` from package ids
hamishmack Feb 15, 2024
16cfbb9
Update materialized files
hamishmack Feb 16, 2024
b3d67e9
ifdLevel 1
hamishmack Feb 16, 2024
0ee1cbc
ifdLevel 2
hamishmack Feb 16, 2024
86cb94f
ifdLevel 3
hamishmack Feb 17, 2024
fd6f645
Merge remote-tracking branch 'origin/master' into hkm/inplace-ghc-boo…
hamishmack Mar 19, 2024
2d38fb7
This did not work
hamishmack Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,110 changes: 495 additions & 615 deletions ...64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-9.8.1-x86_64-linux/ghc-pkg/dump-global
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...y-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-9.8.1-x86_64-linux/ghc/info
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,066 changes: 515 additions & 551 deletions materialized/dummy-ghc/ghc-9.8.1-aarch64-darwin/ghc-pkg/dump-global
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion materialized/dummy-ghc/ghc-9.8.1-aarch64-darwin/ghc/info
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,069 changes: 517 additions & 552 deletions materialized/dummy-ghc/ghc-9.8.1-aarch64-linux/ghc-pkg/dump-global
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion materialized/dummy-ghc/ghc-9.8.1-aarch64-linux/ghc/info
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,066 changes: 514 additions & 552 deletions materialized/dummy-ghc/ghc-9.8.1-x86_64-darwin/ghc-pkg/dump-global
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion materialized/dummy-ghc/ghc-9.8.1-x86_64-darwin/ghc/info
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,116 changes: 505 additions & 611 deletions materialized/dummy-ghc/ghc-9.8.1-x86_64-linux/ghc-pkg/dump-global
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions materialized/dummy-ghc/ghc-9.8.1-x86_64-linux/ghc/info
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,057 changes: 512 additions & 545 deletions ...cript-unknown-ghcjs-javascript-unknown-ghcjs-ghc-9.8.1-aarch64-darwin/ghc-pkg/dump-global
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...y-ghc/javascript-unknown-ghcjs-javascript-unknown-ghcjs-ghc-9.8.1-aarch64-darwin/ghc/info
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,057 changes: 512 additions & 545 deletions ...script-unknown-ghcjs-javascript-unknown-ghcjs-ghc-9.8.1-aarch64-linux/ghc-pkg/dump-global
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...my-ghc/javascript-unknown-ghcjs-javascript-unknown-ghcjs-ghc-9.8.1-aarch64-linux/ghc/info
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,057 changes: 512 additions & 545 deletions ...script-unknown-ghcjs-javascript-unknown-ghcjs-ghc-9.8.1-x86_64-darwin/ghc-pkg/dump-global
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...my-ghc/javascript-unknown-ghcjs-javascript-unknown-ghcjs-ghc-9.8.1-x86_64-darwin/ghc/info
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,088 changes: 493 additions & 595 deletions ...ascript-unknown-ghcjs-javascript-unknown-ghcjs-ghc-9.8.1-x86_64-linux/ghc-pkg/dump-global
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...mmy-ghc/javascript-unknown-ghcjs-javascript-unknown-ghcjs-ghc-9.8.1-x86_64-linux/ghc/info
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,134 changes: 505 additions & 629 deletions ...4-unknown-linux-musl-x86_64-unknown-linux-musl-ghc-9.8.1-x86_64-linux/ghc-pkg/dump-global
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...y-ghc/x86_64-unknown-linux-musl-x86_64-unknown-linux-musl-ghc-9.8.1-x86_64-linux/ghc/info
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,106 changes: 496 additions & 610 deletions ...ummy-ghc/x86_64-w64-mingw32-x86_64-w64-mingw32-ghc-9.8.1-x86_64-linux/ghc-pkg/dump-global
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions materialized/dummy-ghc/x86_64-w64-mingw32-x86_64-w64-mingw32-ghc-9.8.1-x86_64-linux/ghc/info
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions overlays/bootstrap.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ in {
# Returns true iff this derivation's version is greater than or equal to ver.
versionAtLeast = ver: !versionLessThan ver;
fromUntil = start: end: final.lib.optional (versionAtLeast start && versionLessThan end);
from = start: final.lib.optional (versionAtLeast start);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[diff] reported by reviewdog 🐶

Suggested change
from = start: final.lib.optional (versionAtLeast start);

until = end: final.lib.optional (versionLessThan end);
always = final.lib.optional true;
# Try to avoid reordering the patches unless a patch is added or changed that
Expand Down
4 changes: 0 additions & 4 deletions test/plugin/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ let
project = project' {
inherit compiler-nix-name evalPackages;
src = testSrc "plugin";
cabalProjectLocal = builtins.readFile ../cabal.project.local;
modules = [{
reinstallableLibGhc = builtins.compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.8.1" < 0;
}];
};

packages = project.hsPkgs;
Expand Down