From a63c085661f8c13974fbd6434bb1a7c748a4d750 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Tue, 10 Oct 2023 15:53:34 +1100 Subject: haskell.compiler.ghc98: init at 9.8.1 https://www.haskell.org/ghc/blog/20231009-ghc-9.8.1-released.html - Use source-built GHC 9.4.7, pending packaging of bindist. - The aarch64-linux space saving strategy via disabling hyperlinked source is disabled for now, pending either an updated patch or an user defined flavour using https://gitlab.haskell.org/ghc/ghc/-/merge_requests/10850. Co-authored-by: sternenseemann --- pkgs/top-level/release-haskell.nix | 53 +++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 12 deletions(-) (limited to 'pkgs/top-level/release-haskell.nix') diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 40b1d6aacd932..57b21b8ef6d59 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -73,6 +73,7 @@ let ghc947 ghc962 ghc963 + ghc981 ]; # packagePlatforms applied to `haskell.packages.*` @@ -483,35 +484,55 @@ let # and to confirm that critical packages for the # package sets (like Cabal, jailbreak-cabal) are # working as expected. - cabal-install = released; - Cabal_3_10_1_0 = released; - Cabal-syntax_3_10_1_0 = released; - cabal2nix = released; - cabal2nix-unstable = released; + cabal-install = lib.subtractLists [ + compilerNames.ghc981 + ] released; + Cabal_3_10_1_0 = lib.subtractLists [ + compilerNames.ghc981 + ] released; + Cabal-syntax_3_10_1_0 = lib.subtractLists [ + compilerNames.ghc981 + ] released; + cabal2nix = lib.subtractLists [ + compilerNames.ghc981 + ] released; + cabal2nix-unstable = lib.subtractLists [ + compilerNames.ghc981 + ] released; funcmp = released; haskell-language-server = lib.subtractLists [ # Support ceased as of 1.9.0.0 compilerNames.ghc884 # Support ceased as of 2.3.0.0 compilerNames.ghc8107 + # Not yet supported + compilerNames.ghc981 ] released; hoogle = lib.subtractLists [ compilerNames.ghc962 compilerNames.ghc963 + compilerNames.ghc981 ] released; hlint = lib.subtractLists [ compilerNames.ghc962 compilerNames.ghc963 + compilerNames.ghc981 + ] released; + hpack = lib.subtractLists [ + compilerNames.ghc981 ] released; - hpack = released; hsdns = released; jailbreak-cabal = released; - language-nix = released; + language-nix = lib.subtractLists [ + compilerNames.ghc981 + ] released; large-hashable = [ compilerNames.ghc928 ]; nix-paths = released; - titlecase = released; + titlecase = lib.subtractLists [ + compilerNames.ghc981 + ] released; ghc-api-compat = [ compilerNames.ghc884 compilerNames.ghc8107 @@ -521,9 +542,15 @@ let compilerNames.ghc884 compilerNames.ghc8107 ]; - ghc-lib = released; - ghc-lib-parser = released; - ghc-lib-parser-ex = released; + ghc-lib = lib.subtractLists [ + compilerNames.ghc981 + ] released; + ghc-lib-parser = lib.subtractLists [ + compilerNames.ghc981 + ] released; + ghc-lib-parser-ex = lib.subtractLists [ + compilerNames.ghc981 + ] released; ghc-source-gen = [ # Feel free to remove these as they break, # ghc-source-gen currently doesn't support GHC 9.4 @@ -546,7 +573,9 @@ let compilerNames.ghc962 compilerNames.ghc963 ]; - hashable = released; + hashable = lib.subtractLists [ + compilerNames.ghc981 + ] released; primitive = released; weeder = [ compilerNames.ghc8107 -- cgit 1.4.1