diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-07-25 13:01:20 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-07-25 13:01:20 +0200 |
commit | 0b4156230b1cf59f1cf19d1b80b7d489af1793d1 (patch) | |
tree | b68d32fc91a57d4ba208e7953b0315e3b1bad587 | |
parent | 277bf961c323b6cde46932cc9308135d0687af95 (diff) | |
download | nixpkgs-0b4156230b1cf59f1cf19d1b80b7d489af1793d1.tar nixpkgs-0b4156230b1cf59f1cf19d1b80b7d489af1793d1.tar.gz nixpkgs-0b4156230b1cf59f1cf19d1b80b7d489af1793d1.tar.bz2 nixpkgs-0b4156230b1cf59f1cf19d1b80b7d489af1793d1.tar.lz nixpkgs-0b4156230b1cf59f1cf19d1b80b7d489af1793d1.tar.xz nixpkgs-0b4156230b1cf59f1cf19d1b80b7d489af1793d1.tar.zst nixpkgs-0b4156230b1cf59f1cf19d1b80b7d489af1793d1.zip |
haskell.packages.*.ghc-source-gen: shuffle broken flags around
ghc-source-gen being broken is the norm now, as it only supports GHC < 9.4. To keep tabs on it still (it is required for HLS some of the time), we add it to release-haskell.nix.
8 files changed, 23 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 232130833b0..73d78ff495f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -193,4 +193,7 @@ self: super: { # Needs OneTuple for ghc < 9.2 binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; + + # Requires GHC < 9.4 + ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index b6e46c04ebe..207697356f9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -180,4 +180,7 @@ self: super: { # Later versions only support GHC >= 9.2 ghc-exactprint = self.ghc-exactprint_0_6_4; apply-refact = self.apply-refact_0_9_3_0; + + # Requires GHC < 9.4 + ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 82b8d5eafd6..28d02a5c8e5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -152,4 +152,7 @@ self: super: { # Needs OneTuple for ghc < 9.2 binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans; + + # Requires GHC < 9.4 + ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index fa879fd6a1a..38379c7221c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -109,4 +109,7 @@ self: super: { # A given major version of ghc-exactprint only supports one version of GHC. ghc-exactprint = super.ghc-exactprint_1_5_0; + + # Requires GHC < 9.4 + ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 1f962271861..c11c725d69d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -55,10 +55,6 @@ in { # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_3_0_0; - # consequences of doctest breakage follow: - - ghc-source-gen = checkAgainAfter super.ghc-source-gen "0.4.3.0" "fails to build" (markBroken super.ghc-source-gen); - # Jailbreaks & Version Updates hashable-time = doJailbreak super.hashable-time; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 479c114e6c9..8489e7f7c2e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1781,6 +1781,7 @@ broken-packages: - ghc-plugs-out - ghc-proofs - ghc-simple + - ghc-source-gen - ghc-srcspan-plugin - ghc-syb - ghc-syb-utils diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cea1139bfae..f1a1d8c1a30 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -112497,6 +112497,8 @@ self: { ]; description = "Constructs Haskell syntax trees for the GHC API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghc-srcspan-plugin" = callPackage diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index a9d8fa4cdd7..fffab849037 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -516,6 +516,14 @@ let ghc-lib = released; ghc-lib-parser = released; ghc-lib-parser-ex = released; + ghc-source-gen = [ + # Feel free to remove these as they break, + # ghc-source-gen currently doesn't support GHC 9.4 + compilerNames.ghc884 + compilerNames.ghc8107 + compilerNames.ghc902 + compilerNames.ghc928 + ]; ghc-tags = [ compilerNames.ghc8107 compilerNames.ghc902 |