diff options
author | maralorn <mail@maralorn.de> | 2024-06-23 19:09:26 +0200 |
---|---|---|
committer | maralorn <mail@maralorn.de> | 2024-06-23 21:32:36 +0200 |
commit | ef7f682c9569df67e852f7fb699e4895a0a2af8e (patch) | |
tree | bbb1e0794801d81dc823b0b1573e8f1351031812 | |
parent | aa9666901a329e225fa1f396aeeaa1b91c2584b9 (diff) |
haskellPackages.fourmolu: Cleanup overrides
4 files changed, 4 insertions, 44 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 c4904bd60b4a..ae8aa37a720c 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_4_0; - fourmolu = self.fourmolu_0_15_0_0; + ormolu = self.ormolu_0_7_7_0; + fourmolu = self.fourmolu_0_16_2_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 bc102cb88861..e3845b8c16f8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -99,7 +99,6 @@ extra-packages: - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - 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.11.* # 2023-10-22: for hls on ghc 9.0 - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 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 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 706bd2dfecf2..d6f3a25cab8a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1202,12 +1202,10 @@ self: super: builtins.intersectAttrs super { { fourmolu = fourmoluTestFix super.fourmolu; - fourmolu_0_14_1_0 = fourmoluTestFix super.fourmolu_0_14_1_0; - fourmolu_0_15_0_0 = fourmoluTestFix super.fourmolu_0_15_0_0; + fourmolu_0_16_2_0 = fourmoluTestFix super.fourmolu_0_16_2_0; }) fourmolu - fourmolu_0_14_1_0 - fourmolu_0_15_0_0 + fourmolu_0_16_2_0 ; # Test suite needs to execute 'disco' binary diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9dc33bd74992..0f081d7bda66 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -111972,43 +111972,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "fourmolu_0_11_0_0" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base, binary - , bytestring, Cabal-syntax, containers, Diff, directory, dlist - , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover - , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, pretty, process, QuickCheck, syb, temporary, text - , th-env, yaml - }: - mkDerivation { - pname = "fourmolu"; - version = "0.11.0.0"; - sha256 = "1hs743r2saqzk4sbwqpyw8k62jhlrc914gizcw5yp0r1gpq83idr"; - revision = "2"; - editedCabalFile = "1gjmdwcm10d178bg468xzzg9b0fc4saxi2fhdc771rqaggd1rxg1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal array base binary bytestring Cabal-syntax - containers Diff directory dlist file-embed filepath ghc-lib-parser - megaparsec MemoTrie mtl syb text yaml - ]; - executableHaskellDepends = [ - base containers directory filepath ghc-lib-parser - optparse-applicative text th-env yaml - ]; - testHaskellDepends = [ - base Cabal-syntax containers Diff directory filepath ghc-lib-parser - hspec hspec-megaparsec path path-io pretty process QuickCheck - temporary text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - mainProgram = "fourmolu"; - }) {}; - "fourmolu" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary , bytestring, Cabal-syntax, containers, deepseq, Diff, directory |