From c2ca1d98e94c6c2bce443ea07e3cf8aed2c04538 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 7 Jul 2024 17:36:13 +0200 Subject: [PATCH] haskell.packages.ghc98.haskell-language-server: Fix build --- .../configuration-ghc-9.8.x.nix | 4 +- .../configuration-hackage2nix/main.yaml | 2 + .../haskell-modules/configuration-nix.nix | 8 +- .../haskell-modules/hackage-packages.nix | 73 +++++++++++++++++++ 4 files changed, 80 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 73661b29bef9..72ee1aca1d25 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -63,8 +63,8 @@ self: super: { attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; xmonad = doDistribute self.xmonad_0_18_0; apply-refact = self.apply-refact_0_14_0_0; - ormolu = self.ormolu_0_7_7_0; - fourmolu = self.fourmolu_0_16_2_0; + ormolu = self.ormolu_0_7_4_0; + fourmolu = self.fourmolu_0_15_0_0; stylish-haskell = self.stylish-haskell_0_14_6_0; hlint = self.hlint_3_8; ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_11_0; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 6e8ea05af4b4..72372897737e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -96,8 +96,10 @@ extra-packages: - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat + - fourmolu == 0.15.0.0 # 2024-07-07: for ghc 9.8 compat - ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2 - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat + - ormolu == 0.7.4.0 # 2024-07-07: for ghc 9.8 compat - primitive-unlifted == 0.1.3.1 # 2024-03-16: Needed for hls on ghc 9.2 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - resolv < 0.2 # required to build cabal-install-3.10.1.0 with Stackage LTS 21 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 90fcf001b0ac..479c53ac963f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1212,12 +1212,10 @@ self: super: builtins.intersectAttrs super { ''; }); in - - { - fourmolu = fourmoluTestFix super.fourmolu; - fourmolu_0_16_2_0 = fourmoluTestFix super.fourmolu_0_16_2_0; - }) + builtins.mapAttrs (_: fourmoluTestFix) super + ) fourmolu + fourmolu_0_15_0_0 fourmolu_0_16_2_0 ; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ca1ee93cd749..b26e39e67fec 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -111996,6 +111996,43 @@ self: { mainProgram = "fourmolu"; }) {}; + "fourmolu_0_15_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, binary + , bytestring, Cabal-syntax, containers, deepseq, Diff, directory + , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover + , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative + , path, path-io, pretty, process, QuickCheck, scientific, syb + , temporary, text, th-env, yaml + }: + mkDerivation { + pname = "fourmolu"; + version = "0.15.0.0"; + sha256 = "11xy0k5zkhd0dz7ify0m466l90j8sblm9rzzwkc0nn0d8pxyizfq"; + revision = "1"; + editedCabalFile = "1a0wnrvygipxivjzjbbvl1vm4pc45p5p239z741xj9jj5kipjh9c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal array base binary bytestring Cabal-syntax + containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml + ]; + executableHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + optparse-applicative text th-env yaml + ]; + testHaskellDepends = [ + base bytestring Cabal-syntax containers Diff directory filepath + ghc-lib-parser hspec hspec-megaparsec megaparsec path path-io + pretty process QuickCheck temporary text yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "fourmolu"; + }) {}; + "fourmolu_0_16_2_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary , bytestring, Cabal-syntax, choice, containers, deepseq, Diff @@ -227111,6 +227148,42 @@ self: { mainProgram = "ormolu"; }) {}; + "ormolu_0_7_4_0" = callPackage + ({ mkDerivation, ansi-terminal, array, base, binary, bytestring + , Cabal-syntax, containers, deepseq, Diff, directory, file-embed + , filepath, ghc-lib-parser, hspec, hspec-discover, hspec-megaparsec + , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io + , QuickCheck, syb, temporary, text, th-env + }: + mkDerivation { + pname = "ormolu"; + version = "0.7.4.0"; + sha256 = "1s7a9crjhbsmjkdvpv8ycygpiikv96s96p3lmjik4pb3q7idir2z"; + revision = "1"; + editedCabalFile = "0cr96kxx13l6vjmgx3jan0xcr7zn68gnihfqsdz6fi7jbd34jhzl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array base binary bytestring Cabal-syntax containers + deepseq Diff directory file-embed filepath ghc-lib-parser + megaparsec MemoTrie mtl syb text + ]; + executableHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + optparse-applicative text th-env + ]; + testHaskellDepends = [ + base Cabal-syntax containers directory filepath ghc-lib-parser + hspec hspec-megaparsec megaparsec path path-io QuickCheck temporary + text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "ormolu"; + }) {}; + "ormolu_0_7_7_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, binary, bytestring , Cabal-syntax, choice, containers, deepseq, Diff, directory