colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell.packages.*.ghc-tags: unbreak

Browse Source 
This just requires picking the right version of the package for all
compiler versions.
This commit is contained in:
sternenseemann 2024-06-04 14:51:22 +02:00
parent 8ff463e9fc
commit bd6942679c
6 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View File

@ -86,7 +86,7 @@ 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;

3
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
View File

@ -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
#

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@ -2014,7 +2014,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

7
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View File

@ -66,11 +66,11 @@ extra-packages:
- 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-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8
- ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.2
- 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 9.2
- 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)
@ -119,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

27
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -120677,7 +120677,6 @@ self: {
license = lib.licenses.mpl20;
hydraPlatforms = lib.platforms.none;
mainProgram = "ghc-tags";
broken = true;
}) {};
"ghc-tags_1_6" = callPackage
@ -120701,7 +120700,29 @@ self: {
license = lib.licenses.mpl20;
hydraPlatforms = lib.platforms.none;
mainProgram = "ghc-tags";
broken = true;
}) {};
"ghc-tags_1_7" = callPackage
({ mkDerivation, aeson, async, attoparsec, base, bytestring
, containers, deepseq, directory, filepath, ghc, ghc-boot
, ghc-paths, optparse-applicative, process, stm, temporary, text
, time, vector, yaml
}:
mkDerivation {
pname = "ghc-tags";
version = "1.7";
sha256 = "17189yi1zffgcdwx0nb6n4pbv3jhfajhfnag84fnqwy4kbvl5ma4";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
aeson async attoparsec base bytestring containers deepseq directory
filepath ghc ghc-boot ghc-paths optparse-applicative process stm
temporary text time vector yaml
];
description = "Utility for generating ctags and etags with GHC API";
license = lib.licenses.mpl20;
hydraPlatforms = lib.platforms.none;
mainProgram = "ghc-tags";
}) {};
"ghc-tags" = callPackage
@ -120723,9 +120744,7 @@ self: {
];
description = "Utility for generating ctags and etags with GHC API";
license = lib.licenses.mpl20;
hydraPlatforms = lib.platforms.none;
mainProgram = "ghc-tags";
broken = true;
}) {};
"ghc-tags-core" = callPackage

9
pkgs/top-level/release-haskell.nix
View File

@ -565,16 +565,13 @@ let
] 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.ghc9101
] released;