From ad99400541281d1369405d9ef89f453edddff81e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 5 Jan 2025 16:08:08 +0100 Subject: [PATCH] haskellPackages.ghc: 9.6.6 -> 9.8.4 This matches the update from Stackage LTS 22 -> 23 in 7ea7574c. Regenerate the package set with compiler: ghc-9.8.3 passed to Cabal using env \ HACKAGE2NIX=/nix/store/57ivr7wj0bzgkgvgp6i1dsz5rbihy2an-cabal2nix-unstable-2024-12-31/bin/hackage2nix \ bash ./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast since cabal2nix-unstable doesn't build yet (I assume). --- doc/languages-frameworks/haskell.section.md | 2 +- .../manual/release-notes/rl-2505.section.md | 3 + .../haskell-modules/hackage-packages.nix | 217 +++++------------- pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 64 insertions(+), 162 deletions(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 75a23b6aee2f..448cd8e19249 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -58,7 +58,7 @@ Each of those compiler versions has a corresponding attribute set `packages` bui it. However, the non-standard package sets are not tested regularly and, as a result, contain fewer working packages. The corresponding package set for GHC 9.4.8 is `haskell.packages.ghc948`. In fact `haskellPackages` (at the time of writing) is just an alias -for `haskell.packages.ghc966`: +for `haskell.packages.ghc984`: Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`. diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 280b3ddb9488..6935f32309d6 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -13,6 +13,9 @@ - GCC has been updated from GCC 13 to GCC 14. This introduces some backwards‐incompatible changes; see the [upstream porting guide](https://gcc.gnu.org/gcc-14/porting_to.html) for details. +- The default GHC version has been updated from 9.6 to 9.8. + `haskellPackages` also uses Stackage LTS 23 (instead of LTS 22) as a baseline. + - LLVM has been updated from LLVM 16 (on Darwin) and LLVM 18 (on other platforms) to LLVM 19. This introduces some backwards‐incompatible changes; see the [upstream release notes](https://releases.llvm.org/) for details. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index daac0e67efdf..b26afe6db7e0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -26162,8 +26162,8 @@ self: { , bytestring, character-ps, containers, data-fix, deepseq, Diff , directory, dlist, exceptions, filepath, generic-deriving , generically, ghc-prim, hashable, indexed-traversable - , integer-conversion, integer-logarithms, network-uri, nothunks - , OneTuple, primitive, QuickCheck, quickcheck-instances, scientific + , integer-conversion, integer-logarithms, network-uri, OneTuple + , primitive, QuickCheck, quickcheck-instances, scientific , semialign, strict, tagged, tasty, tasty-golden, tasty-hunit , tasty-quickcheck, template-haskell, text, text-iso8601 , text-short, th-abstraction, these, time, time-compat @@ -26187,11 +26187,10 @@ self: { base base-compat base-orphans base16-bytestring bytestring containers data-fix deepseq Diff directory dlist filepath generic-deriving generically ghc-prim hashable indexed-traversable - integer-logarithms network-uri nothunks OneTuple primitive - QuickCheck quickcheck-instances scientific strict tagged tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - text-short these time time-compat unordered-containers uuid-types - vector + integer-logarithms network-uri OneTuple primitive QuickCheck + quickcheck-instances scientific strict tagged tasty tasty-golden + tasty-hunit tasty-quickcheck template-haskell text text-short these + time time-compat unordered-containers uuid-types vector ]; description = "Fast JSON parsing and encoding"; license = lib.licenses.bsd3; @@ -81373,8 +81372,9 @@ self: { "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , binary, bytestring, Cabal, cmdargs, conduit, constraints - , containers, cryptonite, data-ordlist, directory, exceptions, fgl - , filepath, FindBin, hashable, haskeline, html, http-conduit + , containers, crypton-connection, cryptonite, data-default-class + , data-ordlist, directory, exceptions, fgl, filepath, FindBin + , hashable, haskeline, html, http-client-tls, http-conduit , http-types, HUnit, leancheck, memory, mmap, monad-control, mtl , network, network-uri, old-time, parsec, process, QuickCheck , quickcheck-instances, regex-applicative, regex-base, regex-tdfa @@ -81394,12 +81394,13 @@ self: { setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array async attoparsec base base16-bytestring binary bytestring - conduit constraints containers cryptonite data-ordlist directory - exceptions fgl filepath hashable haskeline html http-conduit - http-types memory mmap mtl network network-uri old-time parsec - process regex-applicative regex-base regex-tdfa safe stm tar - temporary terminal-size terminfo text time tls transformers unix - unix-compat utf8-string vector zip-archive zlib + conduit constraints containers crypton-connection cryptonite + data-default-class data-ordlist directory exceptions fgl filepath + hashable haskeline html http-client-tls http-conduit http-types + memory mmap mtl network network-uri old-time parsec process + regex-applicative regex-base regex-tdfa safe stm tar temporary + terminal-size terminfo text time tls transformers unix unix-compat + utf8-string vector zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -120088,13 +120089,26 @@ self: { }) {}; "ghc-exactprint" = callPackage - ({ mkDerivation }: + ({ mkDerivation, base, bytestring, Cabal-syntax, containers + , data-default, Diff, directory, extra, filepath, free, ghc + , ghc-boot, ghc-paths, HUnit, mtl, ordered-containers, silently + , syb + }: mkDerivation { pname = "ghc-exactprint"; version = "1.8.0.0"; sha256 = "10j98rnn69wig6xks1x5xq19730225ksz3il93x8zniddsn40v8v"; isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers data-default directory filepath free ghc + ghc-boot mtl ordered-containers syb + ]; + testHaskellDepends = [ + base bytestring Cabal-syntax containers data-default Diff directory + extra filepath ghc ghc-boot ghc-paths HUnit mtl ordered-containers + silently syb + ]; description = "ExactPrint for GHC"; license = lib.licenses.bsd3; }) {}; @@ -121182,9 +121196,9 @@ self: { "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 + , containers, deepseq, directory, filepath, ghc-lib, ghc-paths + , optparse-applicative, process, stm, temporary, text, time, vector + , yaml }: mkDerivation { pname = "ghc-tags"; @@ -121196,7 +121210,7 @@ self: { isExecutable = true; executableHaskellDepends = [ aeson async attoparsec base bytestring containers deepseq directory - filepath ghc ghc-boot ghc-paths optparse-applicative process stm + filepath ghc-lib ghc-paths optparse-applicative process stm temporary text time vector yaml ]; description = "Utility for generating ctags and etags with GHC API"; @@ -121207,9 +121221,9 @@ self: { "ghc-tags_1_8" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , containers, deepseq, directory, filepath, ghc-lib, ghc-paths - , optparse-applicative, process, stm, temporary, text, time, vector - , yaml + , containers, deepseq, directory, filepath, ghc, ghc-boot + , ghc-paths, optparse-applicative, process, stm, temporary, text + , time, vector, yaml }: mkDerivation { pname = "ghc-tags"; @@ -121221,7 +121235,7 @@ self: { isExecutable = true; executableHaskellDepends = [ aeson async attoparsec base bytestring containers deepseq directory - filepath ghc-lib ghc-paths optparse-applicative process stm + 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"; @@ -153175,12 +153189,12 @@ self: { }) {}; "hlint-plugin" = callPackage - ({ mkDerivation, base, containers, ghc, hlint }: + ({ mkDerivation, base, containers }: mkDerivation { pname = "hlint-plugin"; version = "1.0.2"; sha256 = "1vyaqqa40wsbsg8lddx9qswrfpwvnrdhc310wsl4a3s7zr08q96g"; - libraryHaskellDepends = [ base containers ghc hlint ]; + libraryHaskellDepends = [ base containers ]; description = "GHC plugin for hlint"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -153451,23 +153465,11 @@ self: { }) {}; "hls-class-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, extra, filepath - , ghc, ghc-boot-th, ghc-exactprint, ghcide, hls-graph - , hls-plugin-api, hls-test-utils, lens, lsp, lsp-types, mtl - , row-types, text, transformers - }: + ({ mkDerivation }: mkDerivation { pname = "hls-class-plugin"; version = "2.6.0.0"; sha256 = "0jib2y256fb5b8wgsi9rjsdb3ywwpcbcnbbxmg6q3gwnglrdb1lx"; - libraryHaskellDepends = [ - aeson base containers deepseq extra ghc ghc-boot-th ghc-exactprint - ghcide hls-graph hls-plugin-api lens lsp mtl text transformers - ]; - testHaskellDepends = [ - aeson base filepath ghcide hls-plugin-api hls-test-utils lens - lsp-types row-types text - ]; description = "Class/instance management plugin for Haskell Language Server"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -153614,17 +153616,11 @@ self: { }) {}; "hls-floskell-plugin" = callPackage - ({ mkDerivation, base, filepath, floskell, ghcide, hls-plugin-api - , hls-test-utils, lsp-types, mtl, text, transformers - }: + ({ mkDerivation }: mkDerivation { pname = "hls-floskell-plugin"; version = "2.6.0.0"; sha256 = "1wyk88lynchhzriqj7m9ph0s2c2ivkqg1nmhgb1knkvp8ag27iik"; - libraryHaskellDepends = [ - base floskell ghcide hls-plugin-api lsp-types mtl text transformers - ]; - testHaskellDepends = [ base filepath hls-test-utils ]; description = "Integration with the Floskell code formatter"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -153656,23 +153652,11 @@ self: { }) {}; "hls-gadt-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, extra, filepath, ghc - , ghc-boot-th, ghc-exactprint, ghcide, hls-plugin-api - , hls-refactor-plugin, hls-test-utils, lens, lsp, lsp-test, mtl - , text, transformers, unordered-containers - }: + ({ mkDerivation }: mkDerivation { pname = "hls-gadt-plugin"; version = "2.6.0.0"; sha256 = "0aa602m024s3ch23np2iixmkwv6474va20bjdgiwdgc8vahg4grg"; - libraryHaskellDepends = [ - aeson base containers extra ghc ghc-boot-th ghc-exactprint ghcide - hls-plugin-api hls-refactor-plugin lens lsp mtl text transformers - unordered-containers - ]; - testHaskellDepends = [ - base filepath hls-test-utils lens lsp lsp-test text - ]; description = "Convert to GADT syntax plugin"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -153717,28 +153701,11 @@ self: { }) {}; "hls-hlint-plugin" = callPackage - ({ mkDerivation, aeson, apply-refact, base, binary, bytestring - , containers, data-default, deepseq, Diff, directory, extra - , filepath, ghc-exactprint, ghc-lib-parser, ghc-lib-parser-ex - , ghcide, hashable, hlint, hls-plugin-api, hls-test-utils, lens - , lsp, lsp-types, mtl, refact, regex-tdfa, row-types, stm - , temporary, text, transformers, unordered-containers - }: + ({ mkDerivation }: mkDerivation { pname = "hls-hlint-plugin"; version = "2.6.0.0"; sha256 = "0ix89wp8nq3iywh6d3w8j7lnfm2g3l9gks8sxkww0z0mfhfxvywc"; - libraryHaskellDepends = [ - aeson apply-refact base binary bytestring containers data-default - deepseq Diff directory extra filepath ghc-exactprint ghc-lib-parser - ghc-lib-parser-ex ghcide hashable hlint hls-plugin-api lens lsp mtl - refact regex-tdfa stm temporary text transformers - unordered-containers - ]; - testHaskellDepends = [ - aeson base containers filepath hls-plugin-api hls-test-utils lens - lsp-types row-types text - ]; description = "Hlint integration plugin with Haskell Language Server"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -153888,31 +153855,11 @@ self: { }) {}; "hls-refactor-plugin" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , data-default, deepseq, directory, dlist, extra, filepath, ghc - , ghc-boot, ghc-exactprint, ghcide, ghcide-test-utils, hls-graph - , hls-plugin-api, hls-test-utils, lens, lsp, lsp-test, lsp-types - , mtl, network-uri, parser-combinators, regex-applicative - , regex-tdfa, retrie, shake, syb, tasty, tasty-expected-failure - , tasty-hunit, tasty-rerun, text, text-rope, time, transformers - , unordered-containers - }: + ({ mkDerivation }: mkDerivation { pname = "hls-refactor-plugin"; version = "2.6.0.0"; sha256 = "0lqy7c3vqn832gs9z86n4clsqb6g73rhnlrvn3sg3h8hkxasfzjf"; - libraryHaskellDepends = [ - aeson base bytestring containers data-default deepseq dlist extra - ghc ghc-boot ghc-exactprint ghcide hls-graph hls-plugin-api lens - lsp mtl parser-combinators regex-applicative regex-tdfa retrie syb - text text-rope time transformers unordered-containers - ]; - testHaskellDepends = [ - aeson async base containers data-default directory extra filepath - ghc ghcide ghcide-test-utils hls-plugin-api hls-test-utils lens - lsp-test lsp-types network-uri parser-combinators regex-tdfa shake - tasty tasty-expected-failure tasty-hunit tasty-rerun text text-rope - ]; description = "Exactprint refactorings for Haskell Language Server"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -153940,49 +153887,22 @@ self: { }) {}; "hls-rename-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, extra, filepath, ghc - , ghc-exactprint, ghcide, hashable, hie-compat, hiedb - , hls-plugin-api, hls-refactor-plugin, hls-test-utils, lens, lsp - , lsp-types, mod, mtl, syb, text, transformers - , unordered-containers - }: + ({ mkDerivation }: mkDerivation { pname = "hls-rename-plugin"; version = "2.6.0.0"; sha256 = "15gjh7r9cc43yz1zp52q349fag4nxv25vhzn5pdma4ch366xyr4g"; - libraryHaskellDepends = [ - base containers extra ghc ghc-exactprint ghcide hashable hie-compat - hiedb hls-plugin-api hls-refactor-plugin lens lsp lsp-types mod mtl - syb text transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base containers filepath hls-plugin-api hls-test-utils - ]; description = "Rename plugin for Haskell Language Server"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; }) {}; "hls-retrie-plugin" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, extra, filepath, ghc, ghcide, hashable, hls-plugin-api - , hls-refactor-plugin, hls-test-utils, lens, lsp, lsp-types, mtl - , retrie, safe-exceptions, stm, text, transformers - , unordered-containers - }: + ({ mkDerivation }: mkDerivation { pname = "hls-retrie-plugin"; version = "2.6.0.0"; sha256 = "11cl4q79jxl73s62ccdarp1570k95picgn3q8lgnqznc6ywdv3zh"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory extra ghc ghcide - hashable hls-plugin-api hls-refactor-plugin lens lsp lsp-types mtl - retrie safe-exceptions stm text transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base containers filepath hls-plugin-api hls-refactor-plugin - hls-test-utils text - ]; description = "Retrie integration plugin for Haskell Language Server"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -154041,24 +153961,11 @@ self: { }) {}; "hls-splice-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, dlist, extra, filepath - , foldl, ghc, ghc-exactprint, ghcide, hls-plugin-api - , hls-refactor-plugin, hls-test-utils, lens, lsp, mtl, retrie - , row-types, syb, text, transformers, unliftio-core - , unordered-containers - }: + ({ mkDerivation }: mkDerivation { pname = "hls-splice-plugin"; version = "2.6.0.0"; sha256 = "00fx8rxdnmam0672vb0az2lw5inqyc22cjfrh8wiwx36i28r8zqj"; - libraryHaskellDepends = [ - aeson base containers dlist extra foldl ghc ghc-exactprint ghcide - hls-plugin-api hls-refactor-plugin lens lsp mtl retrie syb text - transformers unliftio-core unordered-containers - ]; - testHaskellDepends = [ - base filepath hls-test-utils row-types text - ]; description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -154090,19 +153997,11 @@ self: { }) {}; "hls-stylish-haskell-plugin" = callPackage - ({ mkDerivation, base, directory, filepath, ghc, ghc-boot-th - , ghcide, hls-plugin-api, hls-test-utils, lsp-types, mtl - , stylish-haskell, text - }: + ({ mkDerivation }: mkDerivation { pname = "hls-stylish-haskell-plugin"; version = "2.6.0.0"; sha256 = "171068mmb7sdk14s5v794jc0n0mrrq8fkzp2z2wlrmk38mqi3773"; - libraryHaskellDepends = [ - base directory filepath ghc ghc-boot-th ghcide hls-plugin-api - lsp-types mtl stylish-haskell text - ]; - testHaskellDepends = [ base filepath hls-test-utils ]; description = "Integration with the Stylish Haskell code formatter"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -191122,7 +191021,7 @@ self: { broken = true; }) {}; - "libiserv_9_6_6" = callPackage + "libiserv" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , ghci, unix }: @@ -191135,7 +191034,6 @@ self: { ]; description = "Provides shared functionality between iserv and iserv-proxy"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "libjenkins" = callPackage @@ -271557,7 +271455,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "semaphore-compat" = callPackage + "semaphore-compat_1_0_0" = callPackage ({ mkDerivation, base, exceptions, unix }: mkDerivation { pname = "semaphore-compat"; @@ -271568,6 +271466,7 @@ self: { libraryHaskellDepends = [ base exceptions unix ]; description = "Cross-platform abstraction for system semaphores"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "semaphore-plus" = callPackage @@ -285755,14 +285654,14 @@ self: { }) {}; "some" = callPackage - ({ mkDerivation, base, base-orphans, deepseq }: + ({ mkDerivation, base, deepseq }: mkDerivation { pname = "some"; version = "1.0.6"; sha256 = "1fdzhi2rmcigb1c727dyzfak8rgb77bzfr33k1cp987lbnnhd9pp"; revision = "2"; editedCabalFile = "1w4xi6k44bjyrvhq70550fwrvqfybrq747aws708q18zsbriandc"; - libraryHaskellDepends = [ base base-orphans deepseq ]; + libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; license = lib.licenses.bsd3; @@ -302693,9 +302592,9 @@ self: { "templatise" = callPackage ({ mkDerivation, base, bytestring, Cabal-syntax, directory , exceptions, extra, filepath, hspec, http-client, http-conduit - , monad-logger, mtl, network-uri, optparse-applicative, parsec - , process, regex-tdfa, tasty, tasty-golden, tasty-hspec, temporary - , text, time + , monad-logger, mtl, network-uri, optparse-applicative, process + , regex-tdfa, tasty, tasty-golden, tasty-hspec, temporary, text + , time }: mkDerivation { pname = "templatise"; @@ -302707,7 +302606,7 @@ self: { libraryHaskellDepends = [ base bytestring Cabal-syntax exceptions extra filepath http-client http-conduit monad-logger mtl network-uri optparse-applicative - parsec process regex-tdfa text time + process regex-tdfa text time ]; executableHaskellDepends = [ base optparse-applicative ]; testHaskellDepends = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c916412797d..be58ba5150cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6239,8 +6239,8 @@ with pkgs; # until 9.8 is ready (if stdenv.hostPlatform.isStatic then haskell.packages.native-bignum.ghc94 # JS backend can't use gmp - else if stdenv.hostPlatform.isGhcjs then haskell.packages.native-bignum.ghc96 - else haskell.packages.ghc96) + else if stdenv.hostPlatform.isGhcjs then haskell.packages.native-bignum.ghc98 + else haskell.packages.ghc98) // { __recurseIntoDerivationForReleaseJobs = true; }; # haskellPackages.ghc is build->host (it exposes the compiler used to build the