Formatorigin/backport-357224-to-release-24.11

(cherry picked from commit 9314da7ee8d2aedfb15193b8c489da51efe52bb5)

3 files changed, 350 insertions, 69 deletions

diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix
index bae316e32d21..cd605465d060 100644
--- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix
+++ b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-agent.nix
@@ -1,20 +1,82 @@
-{ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
-, bifunctors, binary, binary-conduit, boost, bytestring, Cabal
-, cabal-pkg-config-version-hook, cachix, cachix-api, conduit
-, conduit-extra, containers, directory, dlist, exceptions
-, file-embed, filepath, hercules-ci-api, hercules-ci-api-agent
-, hercules-ci-api-core, hercules-ci-cnix-expr
-, hercules-ci-cnix-store, hostname, hspec, hspec-discover
-, http-client, http-client-tls, http-conduit, HUnit, inline-c
-, inline-c-cpp, katip, lens, lens-aeson, lib, lifted-async
-, lifted-base, monad-control, mtl, network, network-uri, nix
-, optparse-applicative, process, process-extras, profunctors
-, protolude, QuickCheck, safe-exceptions, scientific, servant
-, servant-auth-client, servant-client, servant-client-core, stm
-, tagged, temporary, text, time, tls, tomland, transformers
-, transformers-base, unbounded-delays, unix, unliftio
-, unliftio-core, unordered-containers, uuid, vector, websockets
-, wuss
+{
+  mkDerivation,
+  aeson,
+  async,
+  attoparsec,
+  base,
+  base64-bytestring,
+  bifunctors,
+  binary,
+  binary-conduit,
+  boost,
+  bytestring,
+  Cabal,
+  cabal-pkg-config-version-hook,
+  cachix,
+  cachix-api,
+  conduit,
+  conduit-extra,
+  containers,
+  directory,
+  dlist,
+  exceptions,
+  file-embed,
+  filepath,
+  hercules-ci-api,
+  hercules-ci-api-agent,
+  hercules-ci-api-core,
+  hercules-ci-cnix-expr,
+  hercules-ci-cnix-store,
+  hostname,
+  hspec,
+  hspec-discover,
+  http-client,
+  http-client-tls,
+  http-conduit,
+  HUnit,
+  inline-c,
+  inline-c-cpp,
+  katip,
+  lens,
+  lens-aeson,
+  lib,
+  lifted-async,
+  lifted-base,
+  monad-control,
+  mtl,
+  network,
+  network-uri,
+  nix,
+  optparse-applicative,
+  process,
+  process-extras,
+  profunctors,
+  protolude,
+  QuickCheck,
+  safe-exceptions,
+  scientific,
+  servant,
+  servant-auth-client,
+  servant-client,
+  servant-client-core,
+  stm,
+  tagged,
+  temporary,
+  text,
+  time,
+  tls,
+  tomland,
+  transformers,
+  transformers-base,
+  unbounded-delays,
+  unix,
+  unliftio,
+  unliftio-core,
+  unordered-containers,
+  uuid,
+  vector,
+  websockets,
+  wuss,
 }:
 mkDerivation {
   pname = "hercules-ci-agent";
@@ -22,42 +84,169 @@ mkDerivation {
   sha256 = "ab1c2370dbfdca7d7b67cb1985648edabf40d99f01b88a98d6961a2706c0e591";
   isLibrary = true;
   isExecutable = true;
-  setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ];
+  setupHaskellDepends = [
+    base
+    Cabal
+    cabal-pkg-config-version-hook
+  ];
   libraryHaskellDepends = [
-    aeson async base binary binary-conduit bytestring conduit
-    containers directory dlist exceptions file-embed filepath
-    hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-expr
-    hercules-ci-cnix-store katip lens lens-aeson lifted-async
-    lifted-base monad-control mtl network network-uri process
-    process-extras protolude safe-exceptions stm tagged temporary text
-    time tls transformers transformers-base unbounded-delays unix
-    unliftio unliftio-core uuid vector websockets wuss
+    aeson
+    async
+    base
+    binary
+    binary-conduit
+    bytestring
+    conduit
+    containers
+    directory
+    dlist
+    exceptions
+    file-embed
+    filepath
+    hercules-ci-api-agent
+    hercules-ci-api-core
+    hercules-ci-cnix-expr
+    hercules-ci-cnix-store
+    katip
+    lens
+    lens-aeson
+    lifted-async
+    lifted-base
+    monad-control
+    mtl
+    network
+    network-uri
+    process
+    process-extras
+    protolude
+    safe-exceptions
+    stm
+    tagged
+    temporary
+    text
+    time
+    tls
+    transformers
+    transformers-base
+    unbounded-delays
+    unix
+    unliftio
+    unliftio-core
+    uuid
+    vector
+    websockets
+    wuss
   ];
   executableHaskellDepends = [
-    aeson async attoparsec base base64-bytestring bifunctors binary
-    binary-conduit bytestring cachix cachix-api conduit conduit-extra
-    containers directory dlist exceptions filepath hercules-ci-api
-    hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-expr
-    hercules-ci-cnix-store hostname http-client http-client-tls
-    http-conduit inline-c inline-c-cpp katip lens lens-aeson
-    lifted-async lifted-base monad-control mtl network network-uri
-    optparse-applicative process process-extras profunctors protolude
-    safe-exceptions scientific servant servant-auth-client
-    servant-client servant-client-core stm temporary text time tomland
-    transformers transformers-base unix unliftio unliftio-core
-    unordered-containers uuid vector websockets wuss
+    aeson
+    async
+    attoparsec
+    base
+    base64-bytestring
+    bifunctors
+    binary
+    binary-conduit
+    bytestring
+    cachix
+    cachix-api
+    conduit
+    conduit-extra
+    containers
+    directory
+    dlist
+    exceptions
+    filepath
+    hercules-ci-api
+    hercules-ci-api-agent
+    hercules-ci-api-core
+    hercules-ci-cnix-expr
+    hercules-ci-cnix-store
+    hostname
+    http-client
+    http-client-tls
+    http-conduit
+    inline-c
+    inline-c-cpp
+    katip
+    lens
+    lens-aeson
+    lifted-async
+    lifted-base
+    monad-control
+    mtl
+    network
+    network-uri
+    optparse-applicative
+    process
+    process-extras
+    profunctors
+    protolude
+    safe-exceptions
+    scientific
+    servant
+    servant-auth-client
+    servant-client
+    servant-client-core
+    stm
+    temporary
+    text
+    time
+    tomland
+    transformers
+    transformers-base
+    unix
+    unliftio
+    unliftio-core
+    unordered-containers
+    uuid
+    vector
+    websockets
+    wuss
   ];
   executableSystemDepends = [ boost ];
   executablePkgconfigDepends = [ nix ];
   testHaskellDepends = [
-    aeson async attoparsec base bifunctors binary binary-conduit
-    bytestring conduit containers exceptions filepath
-    hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-store
-    hspec HUnit katip lens lens-aeson lifted-async lifted-base
-    monad-control mtl process profunctors protolude QuickCheck
-    safe-exceptions scientific stm tagged temporary text tomland
-    transformers transformers-base unliftio-core unordered-containers
-    uuid vector
+    aeson
+    async
+    attoparsec
+    base
+    bifunctors
+    binary
+    binary-conduit
+    bytestring
+    conduit
+    containers
+    exceptions
+    filepath
+    hercules-ci-api-agent
+    hercules-ci-api-core
+    hercules-ci-cnix-store
+    hspec
+    HUnit
+    katip
+    lens
+    lens-aeson
+    lifted-async
+    lifted-base
+    monad-control
+    mtl
+    process
+    profunctors
+    protolude
+    QuickCheck
+    safe-exceptions
+    scientific
+    stm
+    tagged
+    temporary
+    text
+    tomland
+    transformers
+    transformers-base
+    unliftio-core
+    unordered-containers
+    uuid
+    vector
   ];
   testToolDepends = [ hspec-discover ];
   homepage = "https://docs.hercules-ci.com";
diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix
index fea1850de2ce..902521b22a60 100644
--- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix
+++ b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-expr.nix
@@ -1,26 +1,79 @@
-{ mkDerivation, aeson, base, boost, bytestring, Cabal
-, cabal-pkg-config-version-hook, conduit, containers, directory
-, exceptions, filepath, hercules-ci-cnix-store, hspec
-, hspec-discover, inline-c, inline-c-cpp, lib, nix, process
-, protolude, QuickCheck, scientific, temporary, text, unliftio
-, unordered-containers, vector
+{
+  mkDerivation,
+  aeson,
+  base,
+  boost,
+  bytestring,
+  Cabal,
+  cabal-pkg-config-version-hook,
+  conduit,
+  containers,
+  directory,
+  exceptions,
+  filepath,
+  hercules-ci-cnix-store,
+  hspec,
+  hspec-discover,
+  inline-c,
+  inline-c-cpp,
+  lib,
+  nix,
+  process,
+  protolude,
+  QuickCheck,
+  scientific,
+  temporary,
+  text,
+  unliftio,
+  unordered-containers,
+  vector,
 }:
 mkDerivation {
   pname = "hercules-ci-cnix-expr";
   version = "0.3.6.5";
   sha256 = "0adbd451815bb6ea7388c0477fe6e114e0ba019819027709855e7834aedcb6df";
-  setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ];
+  setupHaskellDepends = [
+    base
+    Cabal
+    cabal-pkg-config-version-hook
+  ];
   libraryHaskellDepends = [
-    aeson base bytestring conduit containers directory exceptions
-    filepath hercules-ci-cnix-store inline-c inline-c-cpp protolude
-    scientific text unliftio unordered-containers vector
+    aeson
+    base
+    bytestring
+    conduit
+    containers
+    directory
+    exceptions
+    filepath
+    hercules-ci-cnix-store
+    inline-c
+    inline-c-cpp
+    protolude
+    scientific
+    text
+    unliftio
+    unordered-containers
+    vector
   ];
   librarySystemDepends = [ boost ];
   libraryPkgconfigDepends = [ nix ];
   testHaskellDepends = [
-    aeson base bytestring containers filepath hercules-ci-cnix-store
-    hspec process protolude QuickCheck scientific temporary text
-    unordered-containers vector
+    aeson
+    base
+    bytestring
+    containers
+    filepath
+    hercules-ci-cnix-store
+    hspec
+    process
+    protolude
+    QuickCheck
+    scientific
+    temporary
+    text
+    unordered-containers
+    vector
   ];
   testToolDepends = [ hspec-discover ];
   homepage = "https://docs.hercules-ci.com";
diff --git a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix
index dfa342a78650..3ded910b3eda 100644
--- a/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix
+++ b/pkgs/development/haskell-modules/replacements-by-name/hercules-ci-cnix-store.nix
@@ -1,23 +1,62 @@
-{ mkDerivation, base, boost, bytestring, Cabal
-, cabal-pkg-config-version-hook, conduit, containers, exceptions
-, hspec, hspec-discover, inline-c, inline-c-cpp, lib, nix
-, protolude, template-haskell, temporary, text, unix, unliftio-core
-, vector
+{
+  mkDerivation,
+  base,
+  boost,
+  bytestring,
+  Cabal,
+  cabal-pkg-config-version-hook,
+  conduit,
+  containers,
+  exceptions,
+  hspec,
+  hspec-discover,
+  inline-c,
+  inline-c-cpp,
+  lib,
+  nix,
+  protolude,
+  template-haskell,
+  temporary,
+  text,
+  unix,
+  unliftio-core,
+  vector,
 }:
 mkDerivation {
   pname = "hercules-ci-cnix-store";
   version = "0.3.6.1";
   sha256 = "35e3d21f9bbc1c83187af22a2532d227fc42a5cf3cf683a86be7bb7180f10d5e";
-  setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ];
+  setupHaskellDepends = [
+    base
+    Cabal
+    cabal-pkg-config-version-hook
+  ];
   libraryHaskellDepends = [
-    base bytestring conduit containers inline-c inline-c-cpp protolude
-    template-haskell unix unliftio-core vector
+    base
+    bytestring
+    conduit
+    containers
+    inline-c
+    inline-c-cpp
+    protolude
+    template-haskell
+    unix
+    unliftio-core
+    vector
   ];
   librarySystemDepends = [ boost ];
   libraryPkgconfigDepends = [ nix ];
   testHaskellDepends = [
-    base bytestring containers exceptions hspec inline-c inline-c-cpp
-    protolude temporary text
+    base
+    bytestring
+    containers
+    exceptions
+    hspec
+    inline-c
+    inline-c-cpp
+    protolude
+    temporary
+    text
   ];
   testToolDepends = [ hspec-discover ];
   homepage = "https://docs.hercules-ci.com";