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

Jump to bottom

[24.05] haskell.packages.*.ghc-{lib,tags}: pick correct version(s) #318387

Merged
merged 3 commits into from
Jun 12, 2024
Merged

[24.05] haskell.packages.*.ghc-{lib,tags}: pick correct version(s) #318387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73aee49
haskell.packages.ghc98.ghc-lib: downgrade to match ghc-lib-parser*
sternenseemann Jun 4, 2024
9c8cdf1
haskell.packages.ghc90.ghc-lib*: use 9.2.* versions
sternenseemann Jun 4, 2024
a2df884
haskell.packages.*.ghc-tags: unbreak
sternenseemann Jun 4, 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
7 changes: 6 additions & 1 deletion pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,12 @@ self: super: {
haskell-language-server = throw "haskell-language-server has dropped support for ghc 9.0 in version 2.4.0.0, please use a newer ghc version or an older nixpkgs version";

# Needs to use ghc-lib due to incompatible GHC
ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_6);
ghc-tags = doDistribute (addBuildDepend self.ghc-lib self.ghc-tags_1_5);

# ghc-lib >= 9.6 and friends no longer build with GHC 9.0
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_8_20230729;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1;
ghc-lib = doDistribute self.ghc-lib_9_2_8_20230729;

# Test suite sometimes segfaults with GHC 9.0.1 and 9.0.2
# https://github.com/ekmett/reflection/issues/51
Expand Down
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ self: super: {
# https://github.com/mokus0/th-extras/pull/21
th-extras = doJailbreak super.th-extras;

# not in Stackage, needs to match ghc-lib
ghc-tags = doDistribute self.ghc-tags_1_7;

#
# Too strict bounds without upstream fix
#
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ self: super: {
th-abstraction = doDistribute self.th-abstraction_0_7_0_0;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_2_20240223;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
ghc-lib = doDistribute self.ghc-lib_9_10_1_20240511;
ghc-lib = doDistribute self.ghc-lib_9_8_2_20240223;
megaparsec = doDistribute self.megaparsec_9_6_1;
# TODO: remove when aeson updates or launches a revision
# see https://github.com/haskell/aeson/issues/1089 and https://github.com/haskell/aeson/pulls/1088
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2012,7 +2012,6 @@ broken-packages:
- ghc-syb # failure in job https://hydra.nixos.org/build/233236783 at 2023-09-02
- ghc-syb-utils # failure in job https://hydra.nixos.org/build/233229196 at 2023-09-02
- ghc-symbol # failure in job https://hydra.nixos.org/build/252710738 at 2024-03-16
- ghc-tags # failure in job https://hydra.nixos.org/build/252730131 at 2024-03-16
- ghc-tags-plugin # failure in job https://hydra.nixos.org/build/233229916 at 2023-09-02
- ghc-time-alloc-prof # failure in job https://hydra.nixos.org/build/233242289 at 2023-09-02
- ghc-usage # failure in job https://hydra.nixos.org/build/233199565 at 2023-09-02
Expand Down
9 changes: 6 additions & 3 deletions pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,12 @@ extra-packages:
- ghc-exactprint == 0.6.* # 2022-12-12: needed for GHC < 9.2
- ghc-exactprint == 1.5.* # 2023-03-30: needed for GHC == 9.2
- ghc-exactprint == 1.6.* # 2023-03-30: needed for GHC == 9.4
- ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.2
- ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2
- ghc-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8
- ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0
- ghc-lib == 9.8.* # 2024-05-19: preserve for GHC 9.8
- ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0
- ghc-lib-parser == 9.8.* # 2024-05-19: preserve for GHC 9.8
- ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2
- ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 8.10, 9.0
- ghc-lib-parser-ex == 9.8.* # 2024-05-19: preserve for GHC 9.8
- ghc-syntax-highlighter == 0.0.10.* # 2023-11-20:
- gi-soup == 2.4.28 # 2023-04-05: the last version to support libsoup-2.4 (and thus be compatible with our other gi- packages)
Expand Down Expand Up @@ -117,6 +119,7 @@ extra-packages:
- retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2
- ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.*
- ghc-tags == 1.6.* # 2023-02-18: preserve for ghc-lib == 9.4.*
- ghc-tags == 1.7.* # 2023-02-18: preserve for ghc-lib == 9.6.*
- shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.*
- algebraic-graphs < 0.7 # 2023-08-14: Needed for building weeder < 2.6.0
- fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10
Expand Down
49 changes: 45 additions & 4 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file
Open in desktop

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

15 changes: 3 additions & 12 deletions pkgs/top-level/release-haskell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,32 +575,23 @@ let
compilerNames.ghc8107
];
ghc-lib = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
compilerNames.ghc9101
] released;
ghc-lib-parser = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
compilerNames.ghc9101
] released;
ghc-lib-parser-ex = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
compilerNames.ghc9101
] released;
ghc-source-gen = [
# Feel free to remove these as they break,
# ghc-source-gen currently doesn't support GHC 9.4
compilerNames.ghc8107
compilerNames.ghc902
compilerNames.ghc928
];
# broken on 2024-03-16
# ghc-tags = lib.subtractLists [
# compilerNames.ghc981
# compilerNames.ghc982
# ] released;
ghc-tags = lib.subtractLists [
compilerNames.ghc9101
] released;
hashable = lib.subtractLists [
compilerNames.ghc981
compilerNames.ghc982
Expand Down
Loading