Merge remote-tracking branch 'origin/master' into staging-next

2023-01-12 23:07:01 +01:00 · 2023-01-12 23:07:01 +01:00 · 5342b695b1
commit 5342b695b1
parent 0defa75371 da93de31ff
172 changed files with 1335 additions and 606 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -6852,6 +6852,12 @@
    githubId = 3967312;
    name = "Jocelyn Thode";
  };
+  joedevivo = {
+     email = "55951+joedevivo@users.noreply.github.com";
+     github = "joedevivo";
+     githubId = 55951;
+     name = "Joe DeVivo";
+   };
  joelancaster = {
    email = "joe.a.lancas@gmail.com";
    github = "JoeLancaster";
@ -16265,4 +16271,10 @@
    github = "ziguana";
    githubId = 45833444;
  };
+  detegr = {
+    name = "Antti Keränen";
+    email = "detegr@rbx.email";
+    github = "Detegr";
+    githubId = 724433;
+  };
 }
--- a/maintainers/scripts/haskell/hydra-report.hs
+++ b/maintainers/scripts/haskell/hydra-report.hs
@ -112,7 +112,8 @@ main = do
      ["get-report"] -> getBuildReports
      ["ping-maintainers"] -> printMaintainerPing
      ["mark-broken-list"] -> printMarkBrokenList
-      _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list"
+      ["eval-info"] -> printEvalInfo
+      _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list | eval-info"

 reportFileName :: IO FilePath
 reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json"
@ -396,12 +397,22 @@ jobTotals (summaryBuilds -> Table mapping) = getSum <$> Table (Map.foldMapWithKe
 details :: Text -> [Text] -> [Text]
 details summary content = ["<details><summary>" <> summary <> " </summary>", ""] <> content <> ["</details>", ""]

+evalLine :: Eval -> UTCTime -> Text
+evalLine Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}} fetchTime =
+  "*evaluation ["
+   <> showT id
+   <> "](https://hydra.nixos.org/eval/"
+   <> showT id
+   <> ") of nixpkgs commit ["
+   <> Text.take 7 revision
+   <> "](https://github.com/NixOS/nixpkgs/commits/"
+   <> revision
+   <> ") as of "
+   <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime)
+   <> "*"
+
 printBuildSummary :: Eval -> UTCTime -> StatusSummary -> [(Text, Int)] -> Text
-printBuildSummary
-   Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}}
-   fetchTime
-   summary
-   topBrokenRdeps =
+printBuildSummary eval@Eval{id} fetchTime summary topBrokenRdeps =
      Text.unlines $
         headline <> [""] <> tldr <> (("  * "<>) <$> (errors <> warnings)) <> [""]
            <> totals
@ -416,25 +427,14 @@ printBuildSummary
            <> footer
     where
      footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.hs)*"]
+      headline =
+        [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)"
+        , evalLine eval fetchTime ]
      totals =
         [ "#### Build summary"
         , ""
         ]
            <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT numSummary
-      headline =
-         [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)"
-         , "*evaluation ["
-            <> showT id
-            <> "](https://hydra.nixos.org/eval/"
-            <> showT id
-            <> ") of nixpkgs commit ["
-            <> Text.take 7 revision
-            <> "](https://github.com/NixOS/nixpkgs/commits/"
-            <> revision
-            <> ") as of "
-            <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime)
-            <> "*"
-         ]
      brokenLine (name, rdeps) = "[" <> name <> "](https://packdeps.haskellers.com/reverse/" <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) <> "  "
      numSummary = statusToNumSummary summary
      jobsByState predicate = Map.filter (predicate . worstState) summary
@ -469,6 +469,11 @@ printBuildSummary
      maintainedJob = Map.lookup "maintained" summary
      mergeableJob = Map.lookup "mergeable" summary

+printEvalInfo :: IO ()
+printEvalInfo = do
+   (eval, fetchTime, _) <- readBuildReports
+   putStrLn (Text.unpack $ evalLine eval fetchTime)
+
 printMaintainerPing :: IO ()
 printMaintainerPing = do
   (maintainerMap, (reverseDependencyMap, topBrokenRdeps)) <- concurrently getMaintainerMap do
--- a/maintainers/scripts/haskell/mark-broken.sh
+++ b/maintainers/scripts/haskell/mark-broken.sh
@ -34,6 +34,7 @@ clear="env -u HOME -u NIXPKGS_CONFIG"
 $clear maintainers/scripts/haskell/regenerate-hackage-packages.sh
 $clear maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh
 $clear maintainers/scripts/haskell/regenerate-hackage-packages.sh
+evalline=$(maintainers/scripts/haskell/hydra-report.hs eval-info)

 if [[ "${1:-}" == "--do-commit" ]]; then
 git add $broken_config
@ -42,6 +43,8 @@ git add pkgs/development/haskell-modules/hackage-packages.nix
 git commit -F - << EOF
 haskellPackages: mark builds failing on hydra as broken

-This commit has been generated by maintainers/scripts/haskell/mark-broken.sh
+This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on
+$evalline
+from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates
 EOF
 fi
--- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
@ -132,6 +132,14 @@
          before upgrading their systems.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          <literal>git-bug</literal> has been updated to at least
+          version 0.8.0, which includes backwards incompatible changes.
+          The <literal>git-bug-migration</literal> package can be used
+          to upgrade existing repositories.
+        </para>
+      </listitem>
      <listitem>
        <para>
          The EC2 image module no longer fetches instance metadata in
@ -543,6 +551,13 @@
          <literal>libax25</literal> package.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          <literal>nixos-version</literal> now accepts
+          <literal>--configuration-revision</literal> to display more
+          information about the current generation revision
+        </para>
+      </listitem>
    </itemizedlist>
  </section>
 </section>
--- a/nixos/doc/manual/man-nixos-version.xml
+++ b/nixos/doc/manual/man-nixos-version.xml
@ -21,6 +21,10 @@
    <option>--revision</option>
   </arg>

+   <arg>
+    <option>--configuration-revision</option>
+   </arg>
+
   <arg>
    <option>--json</option>
   </arg>
@ -118,6 +122,23 @@
    </listitem>
   </varlistentry>

+   <varlistentry>
+    <term>
+     <option>--configuration-revision</option>
+    </term>
+    <listitem>
+     <para>
+      Show the configuration revision if available. This could be the full SHA1
+      hash of the Git commit of the system flake, if you add
+      <screen>{ system.configurationRevision = self.rev or "dirty"; }</screen>
+      to the <screen>modules</screen> array of your flake.nix system configuration e.g.
+<screen><prompt>$ </prompt>nixos-version --configuration-revision
+aa314ebd1592f6cdd53cb5bba8bcae97d9323de8
+</screen>
+     </para>
+    </listitem>
+   </varlistentry>
+
   <varlistentry>
    <term>
     <option>--json</option>
--- a/nixos/doc/manual/release-notes/rl-2305.section.md
+++ b/nixos/doc/manual/release-notes/rl-2305.section.md
@ -44,6 +44,8 @@ In addition to numerous new and upgraded packages, this release has the followin

 - `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems.

+- `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories.
+
 - The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services.
  This breaks services which rely on metadata being present by the time stage-2 is entered. Anything which reads EC2 metadata from `/etc/ec2-metadata` should now have an `after` dependency on `fetch-ec2-metadata.service`

@ -142,3 +144,5 @@ In addition to numerous new and upgraded packages, this release has the followin
 - The new option `services.tailscale.useRoutingFeatures` controls various settings for using Tailscale features like exit nodes and subnet routers. If you wish to use your machine as an exit node, you can set this setting to `server`, otherwise if you wish to use an exit node you can set this setting to `client`. The strict RPF warning has been removed as the RPF will be loosened automatically based on the value of this setting.

 - [Xastir](https://xastir.org/index.php/Main_Page) can now access AX.25 interfaces via the `libax25` package.
+
+- `nixos-version` now accepts `--configuration-revision` to display more information about the current generation revision
--- a/nixos/modules/installer/tools/nixos-version.sh
+++ b/nixos/modules/installer/tools/nixos-version.sh
@ -8,11 +8,18 @@ case "$1" in
    ;;
  --hash|--revision)
    if ! [[ @revision@ =~ ^[0-9a-f]+$ ]]; then
-      echo "$0: Nixpkgs commit hash is unknown"
+      echo "$0: Nixpkgs commit hash is unknown" >&2
      exit 1
    fi
    echo "@revision@"
    ;;
+  --configuration-revision)
+    if [[ "@configurationRevision@" =~ "@" ]]; then
+      echo "$0: configuration revision is unknown" >&2
+      exit 1
+    fi
+    echo "@configurationRevision@"
+    ;;
  --json)
    cat <<EOF
@json@
--- a/pkgs/applications/blockchains/namecoin/default.nix
+++ b/pkgs/applications/blockchains/namecoin/default.nix
@ -3,13 +3,13 @@

 stdenv.mkDerivation rec {
  pname = "namecoin" + lib.optionalString (!withGui) "d";
-  version = "23.0";
+  version = "24.0";

  src = fetchFromGitHub {
    owner = "namecoin";
    repo = "namecoin-core";
    rev = "nc${version}";
-    sha256 = "sha256-MfqJ7EcJvlQ01Mr1RQpXVNUlGIwNqFTxrVwGa+Hus+A=";
+    sha256 = "sha256-DSUYqNHgPsHVwx3G83pZdzsTjhX2X2mMqt+lAlIuGp0=";
  };

  nativeBuildInputs = [
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
    description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";
    homepage = "https://namecoin.org";
    license = licenses.mit;
-    maintainers = with maintainers; [ infinisil ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/editors/quartus-prime/default.nix
+++ b/pkgs/applications/editors/quartus-prime/default.nix
@ -44,6 +44,7 @@ in buildFHSUserEnv rec {
    xorg.libXext
    xorg.libXrender
    libudev0-shim
+    libxcrypt
  ];

  passthru = { inherit unwrapped; };
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -821,6 +821,18 @@ final: prev:
    meta.homepage = "https://github.com/ayu-theme/ayu-vim/";
  };

+  b64-nvim = buildVimPluginFrom2Nix {
+    pname = "b64.nvim";
+    version = "2022-08-22";
+    src = fetchFromGitHub {
+      owner = "taybart";
+      repo = "b64.nvim";
+      rev = "12dde6ebc3035f010833f513cfbd9abad92b28b3";
+      sha256 = "0h3ghaddqf00q7gih53ni7mx0iw5k9m616j34yg6hdf6s12zp5qw";
+    };
+    meta.homepage = "https://github.com/taybart/b64.nvim/";
+  };
+
  barbar-nvim = buildVimPluginFrom2Nix {
    pname = "barbar.nvim";
    version = "2023-01-03";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -67,6 +67,7 @@ https://github.com/rmagatti/auto-session/,,
 https://github.com/vim-scripts/autoload_cscope.vim/,,
 https://github.com/rafi/awesome-vim-colorschemes/,,
 https://github.com/ayu-theme/ayu-vim/,,
+https://github.com/taybart/b64.nvim/,HEAD,
 https://github.com/romgrk/barbar.nvim/,,
 https://github.com/utilyre/barbecue.nvim/,,
 https://github.com/chriskempson/base16-vim/,,
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@ -18,17 +18,17 @@ let
  archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";

  sha256 = {
-    x86_64-linux = "0xdj5v2n34d6p49ng13qr9d4yyyvqr96qv15la2fda9s7n1s659c";
-    x86_64-darwin = "0jgrf534qy39nki0rfc8lrdbdb8ghzarckd3cx9fzq6bw1p2jy1f";
-    aarch64-linux = "133577j6i709dq4ircnh2yklylcmy0kgs6lhly7mx8nrag8qi9c1";
-    aarch64-darwin = "18346igq8b1d0kywy9alvzm0glb46aalznnhr5mql5rhaana92xw";
-    armv7l-linux = "0l0wvgi981ryqbhyh5qalr8lasyf3pg4pzqs9f9hc75ppk4d6sny";
+    x86_64-linux = "192csxsvxdnizdi2jnh0w243h54cb4r99y4p9mnck813bnlcplf5";
+    x86_64-darwin = "0l5n7ba3gd7f73dag52ccd26076a37jvr5a3npyd0078nby0d5n4";
+    aarch64-linux = "073czaap96ddchmsdx7wjqfm68pgimwrngmy2rfgj4b7a0iw3jg6";
+    aarch64-darwin = "1nl3xpjw4ci0z0g7jx5z3v9j6l4vka5w1ijsf2qvrwa27pp8n6hk";
+    armv7l-linux = "10vcmicrk19qi8l01hkvxlay8gqk5qlkx0kpax0blkk91cifqzg7";
  }.${system} or throwSystem;
 in
  callPackage ./generic.nix rec {
    # Please backport all compatible updates to the stable release.
    # This is important for the extension ecosystem.
-    version = "1.74.2";
+    version = "1.74.3";
    pname = "vscode";

    executableName = "code" + lib.optionalString isInsiders "-insiders";
--- a/pkgs/applications/emulators/dynamips/default.nix
+++ b/pkgs/applications/emulators/dynamips/default.nix
@ -4,17 +4,18 @@
 , cmake
 , libelf
 , libpcap
+, nix-update-script
 }:

 stdenv.mkDerivation rec {
  pname = "dynamips";
-  version = "0.2.22";
+  version = "0.2.23";

  src = fetchFromGitHub {
    owner = "GNS3";
    repo = pname;
    rev = "v${version}";
-    sha256 = "1fjjjdaxlw1k95kyq73fndn21qfhrm4cn79av0i4sn7anhg8m83f";
+    hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0=";
  };

  nativeBuildInputs = [ cmake ];
@ -22,6 +23,10 @@ stdenv.mkDerivation rec {

  cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ];

+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
  meta = with lib; {
    inherit (src.meta) homepage;
    description = "A Cisco router emulator";
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@ -7,11 +7,11 @@

 stdenv.mkDerivation rec {
  pname = "graphicsmagick";
-  version = "1.3.38";
+  version = "1.3.39";

  src = fetchurl {
    url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
-    sha256 = "sha256-1gzZ21k1HSucsZvrRDFwrKoo8HPRPSWPZ7NidjXjJnU=";
+    sha256 = "sha256-4wscpY6HPQoe4gg4RyRCTbLTwzpUA04mHRTo+7j40E8=";
  };

  patches = [
--- a/pkgs/applications/graphics/oculante/default.nix
+++ b/pkgs/applications/graphics/oculante/default.nix
@ -18,16 +18,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "oculante";
-  version = "0.6.38";
+  version = "0.6.39";

  src = fetchFromGitHub {
    owner = "woelper";
    repo = pname;
    rev = version;
-    sha256 = "sha256-0msPeW0FoBzHBDfX2iFH4HzAknaGPNThuCLi2vhdK08=";
+    sha256 = "sha256-5onRdxfI5RPa2/Ou9pH84u83Dg79+eMIIYhcEnZrP8A=";
  };

-  cargoSha256 = "sha256-eKRn8MC4/jjPRoajhwrtXsa8n9bGO5MAKjDuwHWs7Oc=";
+  cargoHash = "sha256-Mf2WuTctF0a6YNquntTizRxwq6aqTTnr8QRS/BBVqCo=";

  nativeBuildInputs = [
    cmake
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@ -31,11 +31,11 @@

 stdenv.mkDerivation rec {
  pname = "calibre";
-  version = "6.10.0";
+  version = "6.11.0";

  src = fetchurl {
    url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-JE5AnaCMfe9mI+qLe1LdbbHAdC5X5wLo/zFhcJLLAhk=";
+    hash = "sha256-ylOZ5ljA5uBb2bX/qFhsmPQW6dJVEH9jxQaR2u8C4Wc=";
  };

  # https://sources.debian.org/patches/calibre/${version}+dfsg-1
@ -47,8 +47,8 @@ stdenv.mkDerivation rec {
      hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ=";
    })
    (fetchpatch {
-      name = "0006-Hardening-Qt-code.patch";
-      url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0006-Hardening-Qt-code.patch";
+      name = "0007-Hardening-Qt-code.patch";
+      url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0007-Hardening-Qt-code.patch";
      hash = "sha256-CutVTb7K4tjewq1xAjHEGUHFcuuP/Z4FFtj4xQb4zKQ=";
    })
  ]
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
    xdg-utils
  ] ++ (
    with python3Packages; [
-      (apsw.overrideAttrs (oldAttrs: rec {
+      (apsw.overrideAttrs (oldAttrs: {
        setupPyBuildFlags = [ "--enable=load_extension" ];
      }))
      beautifulsoup4
--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@ -2,13 +2,13 @@

 buildPythonApplication rec {
  pname = "gallery-dl";
-  version = "1.24.2";
+  version = "1.24.4";
  format = "setuptools";

  src = fetchPypi {
    inherit version;
    pname = "gallery_dl";
-    sha256 = "sha256-KqDprKoqpbNpUrM7nAYj71cuMh6U3s65kqVTW2cHeLc=";
+    sha256 = "sha256-g+nbHpbo6O4zoDJm6MRwCXY9pM73NV7RKR59s+8LM10=";
  };

  propagatedBuildInputs = [
--- a/pkgs/applications/misc/gnome-secrets/default.nix
+++ b/pkgs/applications/misc/gnome-secrets/default.nix
@ -16,7 +16,7 @@

 python3Packages.buildPythonApplication rec {
  pname = "gnome-secrets";
-  version = "7.0";
+  version = "7.2";
  format = "other";
  strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943

@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
    owner = "World";
    repo = "secrets";
    rev = version;
-    sha256 = "sha256-P/1lKmWpwidW3fz2zxgVnFoHmROTVB//byDedoOC4u0=";
+    hash = "sha256-CE0iuXYHBhu07mjfXCnAPZQUD1Wy95L+tvBT+uepbrk=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@ -51,6 +51,9 @@ stdenv.mkDerivation rec {
    homepage = "https://repo.or.cz/w/llpp.git";
    description = "A MuPDF based PDF pager written in OCaml";
    platforms = platforms.linux;
+    # Project is unmaintained and fails to build:
+    # link.c:987:27: error: invalid operands to binary >= (have 'fz_location' and 'int')
+    broken = true;
    maintainers = with maintainers; [ pSub ];
    license = licenses.gpl3;
  };
--- a/pkgs/applications/misc/usql/default.nix
+++ b/pkgs/applications/misc/usql/default.nix
@ -1,5 +1,4 @@
 { lib
-, stdenv
 , fetchFromGitHub
 , buildGoModule
 , unixODBC
@ -11,18 +10,18 @@

 buildGoModule rec {
  pname = "usql";
-  version = "0.13.4";
+  version = "0.13.5";

  src = fetchFromGitHub {
    owner = "xo";
    repo = "usql";
    rev = "v${version}";
-    hash = "sha256-YshGqp27N1iOBWSE9UH1zsQlFar2uKf4Jq2W8kSN0Qc=";
+    hash = "sha256-Tsv2nUlxu/nUsupQgYn1CAy/mrwq14OEFZErgO34thU=";
  };

  buildInputs = [ unixODBC icu ];

-  vendorHash = "sha256-qHs5Z7NRdQKPOmYSozhSVQfINMxJewVwQ1Gi4SMWT+8=";
+  vendorHash = "sha256-Zd8/1i9YwVoOoJ1NG5gMGB781IbNBL5lfkrSwYNn9Hg=";
  proxyVendor = true;

  # Exclude broken impala & hive driver
--- a/pkgs/applications/networking/browsers/captive-browser/default.nix
+++ b/pkgs/applications/networking/browsers/captive-browser/default.nix
@ -1,17 +1,29 @@
-{ lib, fetchFromGitHub, buildGoPackage }:
+{ lib, fetchFromGitHub, buildGoModule, fetchpatch }:

-buildGoPackage rec {
+buildGoModule rec {
  pname = "captive-browser";
-  version = "2021-08-01";
-  goPackagePath = pname;
+  version = "unstable-2021-08-01";

  src = fetchFromGitHub {
-    owner  = "FiloSottile";
-    repo   = "captive-browser";
-    rev    = "9c707dc32afc6e4146e19b43a3406329c64b6f3c";
+    owner = "FiloSottile";
+    repo = "captive-browser";
+    rev = "9c707dc32afc6e4146e19b43a3406329c64b6f3c";
    sha256 = "sha256-65lPo5tpE0M/VyyvlzlcVSuHX4AhhVuqK0UF4BIAH/Y=";
  };

+  vendorHash = "sha256-2MFdQ2GIDAdLPuwAiGPO9wU3mm2BDXdyTwoVA1xVlcQ=";
+  deleteVendor = true;
+
+  patches = [
+    # Add go modules support
+    (fetchpatch {
+      url = "https://github.com/FiloSottile/captive-browser/commit/ef50837778ef4eaf38b19887e79c8b6fa830c342.patch";
+      hash = "sha256-w+jDFeO94pMu4ir+G5CzqYlXxYOm9+YfyzbU3sbTyiY=";
+    })
+  ];
+
+  ldflags = [ "-s" "-w" ];
+
  meta = with lib; {
    description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings";
    homepage = "https://blog.filippo.io/captive-browser";
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@ -77,9 +77,6 @@ let
  # These are the providers that don't fall in line with the default model
  special-providers =
    {
-      netlify = automated-providers.netlify.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; });
-      pass = automated-providers.pass.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; });
-      tencentcloud = automated-providers.tencentcloud.overrideAttrs (o: { meta = o.meta // { broken = stdenv.isDarwin; }; });
      # github api seems to be broken, doesn't just fail to recognize the license, it's ignored entirely.
      checkly = automated-providers.checkly.override { spdx = "MIT"; };
      gitlab = automated-providers.gitlab.override { mkProviderFetcher = fetchFromGitLab; owner = "gitlab-org"; };
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -48,11 +48,11 @@
    "vendorHash": "sha256-pz+h8vbdCEgNSH9AoPlIP7zprViAMawXk64SV0wnVPo="
  },
  "alicloud": {
-    "hash": "sha256-Ym3ZN4bRcLXyjnSvWxq/RNvjkfGdpyfkp4sH1D/Ll28=",
+    "hash": "sha256-OXgvI9NbZLvCrXEMW6FcJsGmM5VUgRGCbrWuRAOeDbY=",
    "homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
    "owner": "aliyun",
    "repo": "terraform-provider-alicloud",
-    "rev": "v1.195.0",
+    "rev": "v1.196.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -149,11 +149,11 @@
  },
  "baiducloud": {
    "deleteVendor": true,
-    "hash": "sha256-tEvD70BbN/4376HjE2Yez2qHOM2o3/Uu925HRnmJNwg=",
+    "hash": "sha256-CYU8PI/gMVC9lMiQaPd/M1SKjvZ6vaj5iBfLDTieZR4=",
    "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
    "owner": "baidubce",
    "repo": "terraform-provider-baiducloud",
-    "rev": "v1.19.3",
+    "rev": "v1.19.4",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-3PLBs8LSE5JPtrhmdx+jQsnCrfZQQEUGA7wnf9M72yY="
  },
@ -286,13 +286,13 @@
    "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM="
  },
  "datadog": {
-    "hash": "sha256-PSFxY/etCWojqX4Dw4sYjNjYBglT0lw5Qi6OzZtZCP0=",
+    "hash": "sha256-LZYpKwcNvkmpYfhCuZhxfid42IBhRmzfiHZVYu3XAlA=",
    "homepage": "https://registry.terraform.io/providers/DataDog/datadog",
    "owner": "DataDog",
    "repo": "terraform-provider-datadog",
-    "rev": "v3.19.1",
+    "rev": "v3.20.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-+NHssfTu4JM37AYyeaBNzhNrnFGcnpVP2DPZngjKfcg="
+    "vendorHash": "sha256-IrSQEu3IDFKM9t+3pkygyrrq8KRI8E0BqTui2TR5nFM="
  },
  "dhall": {
    "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=",
@ -424,11 +424,11 @@
    "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
  },
  "github": {
-    "hash": "sha256-foPj/zLJJx3mI1PpDwcThptT5EprEDfakUWRsjaa0nc=",
+    "hash": "sha256-nzQc+KxsgeUR+9Tu/5xmlwdFzlvVzjPUCY9Fbpgsr7E=",
    "homepage": "https://registry.terraform.io/providers/integrations/github",
    "owner": "integrations",
    "repo": "terraform-provider-github",
-    "rev": "v5.13.0",
+    "rev": "v5.14.0",
    "spdx": "MIT",
    "vendorHash": null
  },
@ -471,13 +471,13 @@
    "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g="
  },
  "grafana": {
-    "hash": "sha256-eDrLyLlK/6zigBW7IW+w4FtHP5eW82zo2+Ow55H0SKc=",
+    "hash": "sha256-cEoen5f/FmO241mvXBCs0lzsppybQCACaNYUWT597lU=",
    "homepage": "https://registry.terraform.io/providers/grafana/grafana",
    "owner": "grafana",
    "repo": "terraform-provider-grafana",
-    "rev": "v1.32.0",
+    "rev": "v1.33.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-s6VwvxHXny5gCrbxiRI3F7w3HR3lq2NeiHZgTiU37m0="
+    "vendorHash": "sha256-Eb4J8udIAj7M+72//Pgc4jXhpZ1md1lnh4sKboXVObg="
  },
  "gridscale": {
    "hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=",
@ -688,13 +688,13 @@
    "vendorHash": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw="
  },
  "local": {
-    "hash": "sha256-l9XQpIMMar7ForZuBcGOmqrRuSnthIrilr4CHJ5SiaU=",
+    "hash": "sha256-7P6p23lQ/2Ko/RKETVe7oSZUDwKeGdznUSvbxPWds+Y=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/local",
    "owner": "hashicorp",
    "repo": "terraform-provider-local",
-    "rev": "v2.2.3",
+    "rev": "v2.3.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-5rqn9/NE7Q0VI6SRd2VFKJl4npz9Y0Qp1pEpfj9KxrQ="
+    "vendorHash": "sha256-NXSquRqBaENxWX+ZukDJie/EU+wdEQSxvZQEZqjL+ug="
  },
  "lxd": {
    "hash": "sha256-2YqziG5HZbD/Io/vKYZFZK1PFYVYHOjzHah7s3xEtR0=",
@ -816,11 +816,11 @@
    "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
  },
  "oci": {
-    "hash": "sha256-xGzttO71GTQ9th8qYhVz5EzRIBIWDjkeMUs/TjkUnKU=",
+    "hash": "sha256-QnDamqv8Vo4MjUE15QQH75v3C6CpMBTzlJzq/EbSZ3E=",
    "homepage": "https://registry.terraform.io/providers/oracle/oci",
    "owner": "oracle",
    "repo": "terraform-provider-oci",
-    "rev": "v4.102.0",
+    "rev": "v4.103.0",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -861,13 +861,13 @@
    "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY="
  },
  "opentelekomcloud": {
-    "hash": "sha256-UCnFMsxYD0eGJCtdbV77T62lpmfUH7OZlfL5YEYwcnA=",
+    "hash": "sha256-brODSqSwZXy3B/F5jqPz1h5UJ2hNncG7tIpICJjoBW4=",
    "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
    "owner": "opentelekomcloud",
    "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.32.1",
+    "rev": "v1.32.2",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-gVkbVF2eG8k9vy4BuuoY+s5Uw1QMJ0Q2BHtHDMRpDvY="
+    "vendorHash": "sha256-p01ZIAt8cUv/UklRnMu+TTmfEw8jdde9C4nUJrhA7wE="
  },
  "opsgenie": {
    "hash": "sha256-6lbJyBppfRqqmYpPgyzUTvnvHPSWjE3SJULqliZ2iUI=",
@ -1095,11 +1095,11 @@
    "vendorHash": "sha256-2wPmLpjhG6QgG+BUCO0oIzHjBOWIOYuptgdtSIm9TZw="
  },
  "tencentcloud": {
-    "hash": "sha256-6rwpOXd/1iCgCDhWI7e5GuQu112KaYIvkgdyRpehI7I=",
+    "hash": "sha256-jCtTe1Wi9gvNd1IP+3kYlPYVBT45UkdjlhmNLhEgA10=",
    "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
    "owner": "tencentcloudstack",
    "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.79.4",
+    "rev": "v1.79.5",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@ -1,12 +1,13 @@
 { lib, buildDunePackage, fetchFromGitHub
 , extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3
 , tiny_httpd
-, ounit
+, ounit2
 }:

 buildDunePackage rec {
  pname = "google-drive-ocamlfuse";
  version = "0.7.30";
+  duneVersion = "3";

  src = fetchFromGitHub {
    owner = "astrada";
@ -16,7 +17,7 @@ buildDunePackage rec {
  };

  doCheck = true;
-  checkInputs = [ ounit ];
+  checkInputs = [ ounit2 ];

  buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ];

--- a/pkgs/applications/networking/instant-messengers/qq/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qq/default.nix
@ -20,15 +20,15 @@
 }:

 let
-  version = "3.0.0-565";
+  version = "3.0.0-571";
  srcs = {
    x86_64-linux = fetchurl {
-      url = "https://dldir1.qq.com/qqfile/qq/QQNT/64bd2578/linuxqq_${version}_amd64.deb";
-      sha256 = "sha256-IfBbheVwg4b5PuLX9bzqSuTcElxNaV3tmbGd3v/NkCY=";
+      url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_amd64.deb";
+      sha256 = "sha256-8KcUhZwgeFzGyrQITWnJUzEPGZOCj0LIHLmRuKqkgmQ=";
    };
    aarch64-linux = fetchurl {
-      url = "https://dldir1.qq.com/qqfile/qq/QQNT/64bd2578/linuxqq_${version}_arm64.deb";
-      sha256 = "sha256-6IlAJdPknaQzOE48sdxb5QbB+ZF1xKstF3ARGHM30GY=";
+      url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_arm64.deb";
+      sha256 = "sha256-LvE+Pryq4KLu+BFYVrGiTwBdgOrBguPHQd73MMFlfiY=";
    };
  };
  src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
@ -67,13 +67,13 @@ let
        sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA==";
      };
    };
-    "@azure/core-lro-2.4.0" = {
+    "@azure/core-lro-2.5.0" = {
      name = "_at_azure_slash_core-lro";
      packageName = "@azure/core-lro";
-      version = "2.4.0";
+      version = "2.5.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz";
-        sha512 = "F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ==";
+        url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz";
+        sha512 = "Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ==";
      };
    };
    "@azure/core-paging-1.4.0" = {
@ -175,13 +175,13 @@ let
        sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA==";
      };
    };
-    "@azure/msal-browser-2.32.1" = {
+    "@azure/msal-browser-2.32.2" = {
      name = "_at_azure_slash_msal-browser";
      packageName = "@azure/msal-browser";
-      version = "2.32.1";
+      version = "2.32.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.1.tgz";
-        sha512 = "2G3B12ZEIpiimi6/Yqq7KLk4ud1zZWoHvVd2kJ2VthN1HjMsZjdMUxeHkwMWaQ6RzO6mv9rZiuKmRX64xkXW9g==";
+        url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz";
+        sha512 = "1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g==";
      };
    };
    "@azure/msal-common-7.6.0" = {
@ -193,22 +193,22 @@ let
        sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q==";
      };
    };
-    "@azure/msal-common-9.0.1" = {
+    "@azure/msal-common-9.0.2" = {
      name = "_at_azure_slash_msal-common";
      packageName = "@azure/msal-common";
-      version = "9.0.1";
+      version = "9.0.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.1.tgz";
-        sha512 = "eNNHIW/cwPTZDWs9KtYgb1X6gtQ+cC+FGX2YN+t4AUVsBdUbqlMTnUs6/c/VBxC2AAGIhgLREuNnO3F66AN2zQ==";
+        url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.2.tgz";
+        sha512 = "qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w==";
      };
    };
-    "@azure/msal-node-1.14.5" = {
+    "@azure/msal-node-1.14.6" = {
      name = "_at_azure_slash_msal-node";
      packageName = "@azure/msal-node";
-      version = "1.14.5";
+      version = "1.14.6";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.5.tgz";
-        sha512 = "NcVdMfn8Z3ogN+9RjOSF7uwf2Gki5DEJl0BdDSL83KUAgVAobtkZi5W8EqxbJLrTO/ET0jv5DregrcR5qg2pEA==";
+        url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz";
+        sha512 = "em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA==";
      };
    };
    "@azure/storage-blob-12.12.0" = {
@ -265,13 +265,13 @@ let
        sha512 = "OcwLfZXdQ1OHrLiIcKCn7MqZ7nx205CMKlhe+vL88pe2ymhT9+2P+QhwkYGxMICj8TDHyp8HFKVwpiisUT7iEQ==";
      };
    };
-    "@codemirror/language-6.3.2" = {
+    "@codemirror/language-6.4.0" = {
      name = "_at_codemirror_slash_language";
      packageName = "@codemirror/language";
-      version = "6.3.2";
+      version = "6.4.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@codemirror/language/-/language-6.3.2.tgz";
-        sha512 = "g42uHhOcEMAXjmozGG+rdom5UsbyfMxQFh7AbkeoaNImddL6Xt4cQDL0+JxmG7+as18rUAvZaqzP/TjsciVIrA==";
+        url = "https://registry.npmjs.org/@codemirror/language/-/language-6.4.0.tgz";
+        sha512 = "Wzb7GnNj8vnEtbPWiOy9H0m1fBtE28kepQNGLXekU2EEZv43BF865VKITUn+NoV8OpW6gRtvm29YEhqm46927Q==";
      };
    };
    "@codemirror/lint-6.1.0" = {
@ -292,13 +292,13 @@ let
        sha512 = "69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==";
      };
    };
-    "@codemirror/view-6.7.2" = {
+    "@codemirror/view-6.7.3" = {
      name = "_at_codemirror_slash_view";
      packageName = "@codemirror/view";
-      version = "6.7.2";
+      version = "6.7.3";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@codemirror/view/-/view-6.7.2.tgz";
-        sha512 = "HeK2GyycxceaQVyvYVYXmn1vUKYYBsHCcfGRSsFO+3fRRtwXx2STK0YiFBmiWx2vtU9gUAJgIUXUN8a0osI8Ng==";
+        url = "https://registry.npmjs.org/@codemirror/view/-/view-6.7.3.tgz";
+        sha512 = "Lt+4POnhXrZFfHOdPzXEHxrzwdy7cjqYlMkOWvoFGi6/bAsjzlFfr0NY3B15B/PGx+cDFgM1hlc12wvYeZbGLw==";
      };
    };
    "@colors/colors-1.5.0" = {
@ -499,22 +499,22 @@ let
        sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw==";
      };
    };
-    "@lezer/javascript-1.4.0" = {
+    "@lezer/javascript-1.4.1" = {
      name = "_at_lezer_slash_javascript";
      packageName = "@lezer/javascript";
-      version = "1.4.0";
+      version = "1.4.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.0.tgz";
-        sha512 = "MQ3oLJGEtpUgZ03LOLI60tDnjSkKO6h9hZSe31qJ1UQV+I9bpv3pwSnPUnX0+e+3E1PBVkox0GB2/MXkxg0M2w==";
+        url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.1.tgz";
+        sha512 = "Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA==";
      };
    };
-    "@lezer/lr-1.2.5" = {
+    "@lezer/lr-1.3.0" = {
      name = "_at_lezer_slash_lr";
      packageName = "@lezer/lr";
-      version = "1.2.5";
+      version = "1.3.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.2.5.tgz";
-        sha512 = "f9319YG1A/3ysgUE3bqCHEd7g+3ZZ71MWlwEc42mpnLVYXgfJJgtu1XAyBB4Kz8FmqmnFe9caopDqKeMMMAU6g==";
+        url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.0.tgz";
+        sha512 = "rpvS+WPS/PlbJCiW+bzXPbIFIRXmzRiTEDzMvrvgpED05w5ZQO59AzH3BJen2AnHuJIlP3DcJRjsKLTrkknUNA==";
      };
    };
    "@mapbox/node-pre-gyp-1.0.10" = {
@ -607,13 +607,13 @@ let
        sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA==";
      };
    };
-    "@oclif/core-1.23.2" = {
+    "@oclif/core-1.24.0" = {
      name = "_at_oclif_slash_core";
      packageName = "@oclif/core";
-      version = "1.23.2";
+      version = "1.24.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@oclif/core/-/core-1.23.2.tgz";
-        sha512 = "NdaOaUDTRc6g1yTkOAKiEVOiQhc5CNcWNXa0QF4IS4yTjNqp4DOzgtF9Dwe585nPEKzSbTBiz1wyLOa4qIHSRQ==";
+        url = "https://registry.npmjs.org/@oclif/core/-/core-1.24.0.tgz";
+        sha512 = "J41suyV4fLfLcRRySZdtgFYSjIlpYqD90SY01Fm4+ZJUMcfDh/eQAD4sogyYOsIT0bfEzYOyYCjmfHmgcoX5aA==";
      };
    };
    "@oclif/errors-1.3.6" = {
@ -661,13 +661,13 @@ let
        sha512 = "IMsTN1dXEXaOSre27j/ywGbBjrzx0FNd1XmuhCWCB9NTPrhWI1Ifbz+YLSEcstfQfocYsrbrIessxXb2oon4lA==";
      };
    };
-    "@opentelemetry/api-1.3.0" = {
+    "@opentelemetry/api-1.4.0" = {
      name = "_at_opentelemetry_slash_api";
      packageName = "@opentelemetry/api";
-      version = "1.3.0";
+      version = "1.4.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.3.0.tgz";
-        sha512 = "YveTnGNsFFixTKJz09Oi4zYkiLT5af3WpZDu4aIUM7xX+2bHAkOJayFTVQd6zB8kkWPpbua4Ha6Ql00grdLlJQ==";
+        url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.0.tgz";
+        sha512 = "IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g==";
      };
    };
    "@rudderstack/rudder-sdk-node-1.0.6" = {
@ -706,49 +706,49 @@ let
        sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA==";
      };
    };
-    "@sentry/core-7.29.0" = {
+    "@sentry/core-7.30.0" = {
      name = "_at_sentry_slash_core";
      packageName = "@sentry/core";
-      version = "7.29.0";
+      version = "7.30.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/core/-/core-7.29.0.tgz";
-        sha512 = "+e9aIp2ljtT4EJq3901z6TfEVEeqZd5cWzbKEuQzPn2UO6If9+Utd7kY2Y31eQYb4QnJgZfiIEz1HonuYY6zqQ==";
+        url = "https://registry.npmjs.org/@sentry/core/-/core-7.30.0.tgz";
+        sha512 = "NeLigkBlpcK63ymM63GoIHurml6V3BUe1Vi+trwm4/qqOTzT7PQhvdJCX+o3+atzRBH+zdb6kd4VWx44Oye3KA==";
      };
    };
-    "@sentry/integrations-7.29.0" = {
+    "@sentry/integrations-7.30.0" = {
      name = "_at_sentry_slash_integrations";
      packageName = "@sentry/integrations";
-      version = "7.29.0";
+      version = "7.30.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.29.0.tgz";
-        sha512 = "BkZe3ALij320VtC5bNkeSz3OUhT9oxZsj2lf5rCuRFqcqw4tvVNADF/Y98mf0L4VCy582M9MlNXmwfewJjxGOA==";
+        url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.30.0.tgz";
+        sha512 = "KU8TnJm1Yldxnhdu/EZcIGXU9ptGQPk6ot4smcNx/mKsy575VrDdyVDx8uIYURWyfsg7eOayt6VdC7ISSODp8A==";
      };
    };
-    "@sentry/node-7.29.0" = {
+    "@sentry/node-7.30.0" = {
      name = "_at_sentry_slash_node";
      packageName = "@sentry/node";
-      version = "7.29.0";
+      version = "7.30.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/node/-/node-7.29.0.tgz";
-        sha512 = "s/bN/JS5gPTmwzVms4FtI5YNYtC9aGY4uqdx/llVrIiVv7G6md/oJJzKtO1C4dt6YshjGjSs5KCpEn1NM4+1iA==";
+        url = "https://registry.npmjs.org/@sentry/node/-/node-7.30.0.tgz";
+        sha512 = "YYasu6C3I0HBP4N1oc/ed2nunxhGJgtAWaKwq3lo8uk3uF6cB1A8+2e0CpjzU5ejhbaFPUBxHyj4th39Bvku/w==";
      };
    };
-    "@sentry/types-7.29.0" = {
+    "@sentry/types-7.30.0" = {
      name = "_at_sentry_slash_types";
      packageName = "@sentry/types";
-      version = "7.29.0";
+      version = "7.30.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/types/-/types-7.29.0.tgz";
-        sha512 = "DmoEpoqHPty3VxqubS/5gxarwebHRlcBd/yuno+PS3xy++/i9YPjOWLZhU2jYs1cW68M9R6CcCOiC9f2ckJjdw==";
+        url = "https://registry.npmjs.org/@sentry/types/-/types-7.30.0.tgz";
+        sha512 = "l4A86typvt/SfWh5JffpdxNGkg5EEA8m35BzpIcKmCAQZUDmnb4b478r8jdD2uuOjLmPNmZr1tifdRW4NCLuxQ==";
      };
    };
-    "@sentry/utils-7.29.0" = {
+    "@sentry/utils-7.30.0" = {
      name = "_at_sentry_slash_utils";
      packageName = "@sentry/utils";
-      version = "7.29.0";
+      version = "7.30.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.29.0.tgz";
-        sha512 = "ICcBwTiBGK8NQA8H2BJo0JcMN6yCeKLqNKNMVampRgS6wSfSk1edvcTdhRkW3bSktIGrIPZrKskBHyMwDGF2XQ==";
+        url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.30.0.tgz";
+        sha512 = "tSlBhr5u/LdE2emxIDTDmjmyRr99GnZGIAh5GwRxUgeDQ3VEfNUFlyFodBCbZ6yeYTYd6PWNih5xoHn1+Rf3Sw==";
      };
    };
    "@servie/events-1.0.0" = {
@ -1498,13 +1498,13 @@ let
        sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ==";
      };
    };
-    "aws-sdk-2.1290.0" = {
+    "aws-sdk-2.1293.0" = {
      name = "aws-sdk";
      packageName = "aws-sdk";
-      version = "2.1290.0";
+      version = "2.1293.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1290.0.tgz";
-        sha512 = "qRrXLgK4FpkdxeagjrHuhtEEvYrvRbddTBg1I7KBuMCIhXHzSS3nEUmdZjdyMuQJEvt0BCJjwVkNh8e/5TauDQ==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1293.0.tgz";
+        sha512 = "Wq4zPwJsrYLerXkWzllrTky3DM/Gwg8rKmC/79cDckGzDT8vZ2w/JfI5lW94ckRHjbqQXalChMH3GmWp0sV29Q==";
      };
    };
    "aws-sign2-0.7.0" = {
@ -1813,13 +1813,13 @@ let
        sha512 = "EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg==";
      };
    };
-    "bson-4.7.1" = {
+    "bson-4.7.2" = {
      name = "bson";
      packageName = "bson";
-      version = "4.7.1";
+      version = "4.7.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/bson/-/bson-4.7.1.tgz";
-        sha512 = "XkuFtlCzi0WSy8D6PMhvrQ/q8VlZHN/2bJ/shJglwuA6TPD2ZP/hHLB7iDxOEWVINHN/UVTxP4pqZqOKMXPIXg==";
+        url = "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz";
+        sha512 = "Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ==";
      };
    };
    "buffer-4.9.2" = {
@ -2623,13 +2623,13 @@ let
        sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg==";
      };
    };
-    "cron-parser-4.7.0" = {
+    "cron-parser-4.7.1" = {
      name = "cron-parser";
      packageName = "cron-parser";
-      version = "4.7.0";
+      version = "4.7.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.0.tgz";
-        sha512 = "BdAELR+MCT2ZWsIBhZKDuUqIUCBjHHulPJnm53OfdRLA4EWBjva3R+KM5NeidJuGsNXdEcZkjC7SCnkW5rAFSA==";
+        url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz";
+        sha512 = "WguFaoQ0hQ61SgsCZLHUcNbAvlK0lypKXu62ARguefYmjzaOXIVRNrAmyXzabTwUn4sQvQLkk6bjH+ipGfw8bA==";
      };
    };
    "cross-spawn-4.0.2" = {
@ -3289,13 +3289,13 @@ let
        sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==";
      };
    };
-    "es-abstract-1.21.0" = {
+    "es-abstract-1.21.1" = {
      name = "es-abstract";
      packageName = "es-abstract";
-      version = "1.21.0";
+      version = "1.21.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.0.tgz";
-        sha512 = "GUGtW7eXQay0c+PRq0sGIKSdaBorfVqsCMhGHo4elP7YVqZu9nCZS4UkK4gv71gOWNMra/PaSKD3ao1oWExO0g==";
+        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz";
+        sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==";
      };
    };
    "es-aggregate-error-1.0.9" = {
@ -5404,13 +5404,13 @@ let
        sha512 = "X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw==";
      };
    };
-    "libphonenumber-js-1.10.16" = {
+    "libphonenumber-js-1.10.18" = {
      name = "libphonenumber-js";
      packageName = "libphonenumber-js";
-      version = "1.10.16";
+      version = "1.10.18";
      src = fetchurl {
-        url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.16.tgz";
-        sha512 = "ga6F+8WSmMprzIKvRoeL/iAvkZWSdEpYCDISnXIiQTXw7sezfk+J9IHwzjK3b+6QvyZK8Gjjzjl3Hp+B5lpUXg==";
+        url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.18.tgz";
+        sha512 = "NS4ZEgNhwbcPz1gfSXCGFnQm0xEiyTSPRthIuWytDzOiEG9xnZ2FbLyfJC4tI2BMAAXpoWbNxHYH75pa3Dq9og==";
      };
    };
    "libpq-1.8.12" = {
@ -5818,15 +5818,6 @@ let
        sha512 = "uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==";
      };
    };
-    "lru-cache-4.1.5" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "4.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
-        sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
-      };
-    };
    "lru-cache-5.1.1" = {
      name = "lru-cache";
      packageName = "lru-cache";
@ -5845,6 +5836,15 @@ let
        sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==";
      };
    };
+    "lru-cache-7.14.1" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "7.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz";
+        sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==";
+      };
+    };
    "lru-memoizer-2.1.4" = {
      name = "lru-memoizer";
      packageName = "lru-memoizer";
@ -6430,13 +6430,13 @@ let
        sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
      };
    };
-    "n8n-core-0.150.0" = {
+    "n8n-core-0.150.1" = {
      name = "n8n-core";
      packageName = "n8n-core";
-      version = "0.150.0";
+      version = "0.150.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.150.0.tgz";
-        sha512 = "nSPvZWo1crZoNIDhzqvJbYN1P+EMYKAy10FGxLHu7w2AMBD3IFdVWT1JlYNBMW9aO4NSs0i/Q0NBrA/krSbhoA==";
+        url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.150.1.tgz";
+        sha512 = "75S8iJuy2TaxcBO82Pi72tprlKzJa57k1QOoxU34rCKAGfUVzBrmx8qbI+V/2oVAFmcsByp5s8XCbGrOkj8Z2Q==";
      };
    };
    "n8n-design-system-0.50.1" = {
@ -6448,40 +6448,40 @@ let
        sha512 = "v7eVGosiF2K6aboKS8cydyS+3Brj118iDlAmkgvyla8QT5QV3PBtNEluuCIH8ySdTOGs3TtWzGXSNTdpTZ+rqg==";
      };
    };
-    "n8n-editor-ui-0.176.1" = {
+    "n8n-editor-ui-0.176.2" = {
      name = "n8n-editor-ui";
      packageName = "n8n-editor-ui";
-      version = "0.176.1";
+      version = "0.176.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.176.1.tgz";
-        sha512 = "ySWUKs096wybHDvoFcxKuR3uX5JHwPMWJUwzNFRpN4+bhy7a2SKkA8QAfeWIBPybgng6GgTA6IqPWbZ7LZ+xYQ==";
+        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.176.2.tgz";
+        sha512 = "amkHuLTMiBwUwHQbC31NIdhmizIVgXvw2yztiSqvdbFHNmuJG05QcQAeFexK+JA3HBx+RWKAWUsvSMc9Nw53rw==";
      };
    };
-    "n8n-nodes-base-0.208.1" = {
+    "n8n-nodes-base-0.208.2" = {
      name = "n8n-nodes-base";
      packageName = "n8n-nodes-base";
-      version = "0.208.1";
+      version = "0.208.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.208.1.tgz";
-        sha512 = "uGx2g5xrh6WZ1u8TzyiGHQt4v52LhULLmN6WGOS57Jg658FYiMfWe7soR1iEMTWk/FD2DPQNvoJptGqN7TLlCQ==";
+        url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.208.2.tgz";
+        sha512 = "711ujlB9GnKG8Mv0h5Q/ffETZ6CLArO0XSQRAVCqTZEQ8XdhmpWHn/eCHU2bxMEO9y7yy1E3VLL4MDwQaY8d0g==";
      };
    };
-    "n8n-workflow-0.132.0" = {
+    "n8n-workflow-0.132.1" = {
      name = "n8n-workflow";
      packageName = "n8n-workflow";
-      version = "0.132.0";
+      version = "0.132.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.132.0.tgz";
-        sha512 = "DmWxbOV0Z/8VBNVzQz1O5sD0q82DSxFgJvVRnqL8HayALiiLQbNvgniU2BYJz2SSgKzcpkXX4ZIt94CESqD50w==";
+        url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.132.1.tgz";
+        sha512 = "ksrKfg9hVrVQ5H6jvm7+7YGghVO38VU6ZoaMQWalLfiZHR/W+9l8F3yxdfLX1o8Ewbk0za5dm5tT5E/fc7+Gwg==";
      };
    };
-    "named-placeholders-1.1.2" = {
+    "named-placeholders-1.1.3" = {
      name = "named-placeholders";
      packageName = "named-placeholders";
-      version = "1.1.2";
+      version = "1.1.3";
      src = fetchurl {
-        url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz";
-        sha512 = "wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA==";
+        url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz";
+        sha512 = "eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==";
      };
    };
    "nan-2.17.0" = {
@ -6583,13 +6583,13 @@ let
        sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==";
      };
    };
-    "node-abi-3.30.0" = {
+    "node-abi-3.31.0" = {
      name = "node-abi";
      packageName = "node-abi";
-      version = "3.30.0";
+      version = "3.31.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/node-abi/-/node-abi-3.30.0.tgz";
-        sha512 = "qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw==";
+        url = "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz";
+        sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ==";
      };
    };
    "node-abort-controller-3.0.1" = {
@ -6709,6 +6709,15 @@ let
        sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==";
      };
    };
+    "nodemailer-6.9.0" = {
+      name = "nodemailer";
+      packageName = "nodemailer";
+      version = "6.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.0.tgz";
+        sha512 = "jFaCEGTeT3E/m/5R2MHWiyQH3pSARECRUDM+1hokOYc3lQAAG7ASuy+2jIsYVf+RVa9zePopSQwKNVFH8DKUpA==";
+      };
+    };
    "nopt-5.0.0" = {
      name = "nopt";
      packageName = "nopt";
@ -7843,13 +7852,13 @@ let
        sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==";
      };
    };
-    "punycode-2.1.1" = {
+    "punycode-2.2.0" = {
      name = "punycode";
      packageName = "punycode";
-      version = "2.1.1";
+      version = "2.2.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
-        sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
+        url = "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz";
+        sha512 = "LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==";
      };
    };
    "python-struct-1.1.3" = {
@ -10414,10 +10423,10 @@ in
  n8n = nodeEnv.buildNodePackage {
    name = "n8n";
    packageName = "n8n";
-    version = "0.210.1";
+    version = "0.210.2";
    src = fetchurl {
-      url = "https://registry.npmjs.org/n8n/-/n8n-0.210.1.tgz";
-      sha512 = "mlcpNkl8Nwq1K05rz1BGzoPhaqxsbKOPs4ixr8iueeADfkomsD7ywsRQ6lgHd2GuOGRzXg/upazU/I7exMTj2w==";
+      url = "https://registry.npmjs.org/n8n/-/n8n-0.210.2.tgz";
+      sha512 = "VLlKjcyQnioWgdfZXN4zoQYGy42x7U2LK8zehx+XsjG6wJhrlYyCKzQpECjYZZhzBCYLCvgEzi+mNbqdLDlX7w==";
    };
    dependencies = [
      (sources."@acuminous/bitsyntax-0.1.2" // {
@ -10455,7 +10464,7 @@ in
        ];
      })
      sources."@azure/core-http-compat-1.3.0"
-      (sources."@azure/core-lro-2.4.0" // {
+      (sources."@azure/core-lro-2.5.0" // {
        dependencies = [
          sources."tslib-2.4.1"
        ];
@ -10507,15 +10516,16 @@ in
        ];
      })
      sources."@azure/ms-rest-nodeauth-3.1.1"
-      (sources."@azure/msal-browser-2.32.1" // {
+      (sources."@azure/msal-browser-2.32.2" // {
        dependencies = [
-          sources."@azure/msal-common-9.0.1"
+          sources."@azure/msal-common-9.0.2"
        ];
      })
      sources."@azure/msal-common-7.6.0"
-      (sources."@azure/msal-node-1.14.5" // {
+      (sources."@azure/msal-node-1.14.6" // {
        dependencies = [
-          sources."@azure/msal-common-9.0.1"
+          sources."@azure/msal-common-9.0.2"
+          sources."jsonwebtoken-9.0.0"
        ];
      })
      (sources."@azure/storage-blob-12.12.0" // {
@ -10529,10 +10539,10 @@ in
      sources."@codemirror/autocomplete-6.4.0"
      sources."@codemirror/commands-6.1.3"
      sources."@codemirror/lang-javascript-6.1.2"
-      sources."@codemirror/language-6.3.2"
+      sources."@codemirror/language-6.4.0"
      sources."@codemirror/lint-6.1.0"
      sources."@codemirror/state-6.2.0"
-      sources."@codemirror/view-6.7.2"
+      sources."@codemirror/view-6.7.3"
      sources."@colors/colors-1.5.0"
      sources."@curlconverter/yargs-0.0.2"
      sources."@curlconverter/yargs-parser-0.0.1"
@ -10567,8 +10577,8 @@ in
      sources."@kwsites/promise-deferred-1.1.1"
      sources."@lezer/common-1.0.2"
      sources."@lezer/highlight-1.1.3"
-      sources."@lezer/javascript-1.4.0"
-      sources."@lezer/lr-1.2.5"
+      sources."@lezer/javascript-1.4.1"
+      sources."@lezer/lr-1.3.0"
      sources."@mapbox/node-pre-gyp-1.0.10"
      (sources."@n8n_io/license-sdk-1.8.0" // {
        dependencies = [
@ -10591,7 +10601,7 @@ in
          sources."tslib-2.4.1"
        ];
      })
-      (sources."@oclif/core-1.23.2" // {
+      (sources."@oclif/core-1.24.0" // {
        dependencies = [
          sources."supports-color-8.1.1"
          sources."tslib-2.4.1"
@ -10614,7 +10624,7 @@ in
        ];
      })
      sources."@oclif/screen-3.0.4"
-      sources."@opentelemetry/api-1.3.0"
+      sources."@opentelemetry/api-1.4.0"
      (sources."@rudderstack/rudder-sdk-node-1.0.6" // {
        dependencies = [
          sources."bull-3.29.3"
@ -10633,11 +10643,11 @@ in
          sources."domhandler-5.0.3"
        ];
      })
-      sources."@sentry/core-7.29.0"
-      sources."@sentry/integrations-7.29.0"
-      sources."@sentry/node-7.29.0"
-      sources."@sentry/types-7.29.0"
-      sources."@sentry/utils-7.29.0"
+      sources."@sentry/core-7.30.0"
+      sources."@sentry/integrations-7.30.0"
+      sources."@sentry/node-7.30.0"
+      sources."@sentry/types-7.30.0"
+      sources."@sentry/utils-7.30.0"
      sources."@servie/events-1.0.0"
      sources."@sqltools/formatter-1.2.5"
      sources."@techteamer/ocsp-1.0.0"
@ -10757,7 +10767,7 @@ in
      })
      sources."available-typed-arrays-1.0.5"
      sources."avsc-5.7.7"
-      (sources."aws-sdk-2.1290.0" // {
+      (sources."aws-sdk-2.1293.0" // {
        dependencies = [
          sources."buffer-4.9.2"
          sources."events-1.1.1"
@ -10818,7 +10828,7 @@ in
      sources."brace-expansion-2.0.1"
      sources."braces-3.0.2"
      sources."browser-request-0.3.3"
-      sources."bson-4.7.1"
+      sources."bson-4.7.2"
      sources."buffer-5.7.1"
      sources."buffer-equal-constant-time-1.0.1"
      sources."buffer-from-1.1.2"
@ -10827,7 +10837,7 @@ in
      sources."bufferutil-4.0.7"
      (sources."bull-4.10.2" // {
        dependencies = [
-          sources."cron-parser-4.7.0"
+          sources."cron-parser-4.7.1"
        ];
      })
      sources."busboy-1.6.0"
@ -11016,7 +11026,7 @@ in
      sources."entities-2.2.0"
      sources."env-paths-2.2.1"
      sources."err-code-2.0.3"
-      sources."es-abstract-1.21.0"
+      sources."es-abstract-1.21.1"
      sources."es-aggregate-error-1.0.9"
      sources."es-array-method-boxes-properly-1.0.0"
      sources."es-set-tostringtag-2.0.1"
@ -11319,7 +11329,7 @@ in
      sources."levn-0.3.0"
      sources."libbase64-1.2.1"
      sources."libmime-5.2.0"
-      sources."libphonenumber-js-1.10.16"
+      sources."libphonenumber-js-1.10.18"
      sources."libpq-1.8.12"
      sources."libqp-2.0.1"
      sources."lie-3.1.1"
@ -11378,6 +11388,7 @@ in
      (sources."mailparser-3.6.3" // {
        dependencies = [
          sources."linkify-it-4.0.1"
+          sources."nodemailer-6.8.0"
        ];
      })
      sources."mailsplit-5.4.0"
@ -11510,32 +11521,32 @@ in
        ];
      })
      sources."mz-2.7.0"
-      (sources."n8n-core-0.150.0" // {
+      (sources."n8n-core-0.150.1" // {
        dependencies = [
          sources."concat-stream-2.0.0"
          sources."readable-stream-3.6.0"
        ];
      })
      sources."n8n-design-system-0.50.1"
-      (sources."n8n-editor-ui-0.176.1" // {
+      (sources."n8n-editor-ui-0.176.2" // {
        dependencies = [
          sources."luxon-2.5.2"
        ];
      })
-      (sources."n8n-nodes-base-0.208.1" // {
+      (sources."n8n-nodes-base-0.208.2" // {
        dependencies = [
          sources."chokidar-3.5.2"
          sources."luxon-2.3.2"
        ];
      })
-      (sources."n8n-workflow-0.132.0" // {
+      (sources."n8n-workflow-0.132.1" // {
        dependencies = [
          sources."luxon-2.3.2"
        ];
      })
-      (sources."named-placeholders-1.1.2" // {
+      (sources."named-placeholders-1.1.3" // {
        dependencies = [
-          sources."lru-cache-4.1.5"
+          sources."lru-cache-7.14.1"
        ];
      })
      sources."nan-2.17.0"
@ -11553,7 +11564,7 @@ in
          sources."tslib-2.4.1"
        ];
      })
-      sources."node-abi-3.30.0"
+      sources."node-abi-3.31.0"
      sources."node-abort-controller-3.0.1"
      sources."node-addon-api-4.3.0"
      sources."node-ensure-0.0.0"
@ -11582,7 +11593,7 @@ in
      sources."node-rsa-1.1.1"
      sources."node-ssh-12.0.5"
      sources."nodeify-1.0.1"
-      sources."nodemailer-6.8.0"
+      sources."nodemailer-6.9.0"
      sources."nopt-5.0.0"
      sources."normalize-path-3.0.0"
      sources."normalize-wheel-1.0.1"
@ -11752,7 +11763,7 @@ in
          sources."pump-2.0.1"
        ];
      })
-      sources."punycode-2.1.1"
+      sources."punycode-2.2.0"
      sources."python-struct-1.1.3"
      sources."qs-6.11.0"
      sources."query-string-7.1.3"
--- a/pkgs/applications/radio/gridtracker/default.nix
+++ b/pkgs/applications/radio/gridtracker/default.nix
@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitLab
+, nwjs
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gridtracker";
+  version = "1.22.1226";
+
+  src = fetchFromGitLab {
+    owner = "gridtracker.org";
+    repo = "gridtracker";
+    rev = "v${version}";
+    sha256 = "sha256-/Noc2aqHBjphX6RDqxQBI/OOKZgEnOndn0daBt1edXM=";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace '$(DESTDIR)/usr' '$(DESTDIR)/'
+    substituteInPlace gridtracker.sh \
+      --replace "exec nw" "exec ${nwjs}/bin/nw" \
+      --replace "/usr/share/gridtracker" "$out/share/gridtracker"
+    substituteInPlace gridtracker.desktop \
+      --replace "/usr/share/gridtracker/gridview.png" "$out/share/gridtracker/gridview.png"
+  '';
+
+  makeFlags = [ "DESTDIR=$(out)" "NO_DIST_INSTALL=1" ];
+
+  meta = with lib; {
+    description = "An amateur radio companion to WSJT-X or JTDX";
+    longDescription = ''
+      GridTracker listens to traffic from WSJT-X/JTDX, displays it on a map,
+      and has a sophisticated alerting and filtering system for finding and
+      working interesting stations. It also will upload QSO records to multiple
+      logging frameworks including Logbook of the World.
+    '';
+    homepage = "https://gridtracker.org";
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ melling ];
+  };
+}
--- a/pkgs/applications/version-management/git-bug-migration/default.nix
+++ b/pkgs/applications/version-management/git-bug-migration/default.nix
@ -0,0 +1,34 @@
+{ lib, buildGoModule, fetchFromGitHub, git }:
+buildGoModule rec {
+  pname = "git-bug-migration";
+  version = "0.3.4";
+
+  src = fetchFromGitHub {
+    owner = "MichaelMure";
+    repo = "git-bug-migration";
+    rev = "v${version}";
+    hash = "sha256-IOBgrU3C0ZHD2wx9LRVgKEJzDlUj6z2UXlHGU3tdTdQ=";
+  };
+
+  vendorSha256 = "sha256-Hid9OK91LNjLmDHam0ZlrVQopVOsqbZ+BH2rfQi5lS0=";
+
+  checkInputs = [ git ];
+
+  ldflags = [
+    "-X main.GitExactTag=${version}"
+    "-X main.GitLastTag=${version}"
+  ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+    git config --global user.name 'Nixpkgs Test User'
+    git config --global user.email 'nobody@localhost'
+  '';
+
+  meta =  with lib; {
+    description = "Tool for upgrading repositories using git-bug to new versions";
+    homepage = "https://github.com/MichaelMure/git-bug-migration";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ DeeUnderscore ];
+  };
+}
--- a/pkgs/applications/version-management/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-bug/default.nix
@ -1,42 +1,43 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:

 buildGoModule rec {
  pname = "git-bug";
-  version = "0.8.0"; # the `rev` below pins the version of the source to get
-  rev = "v0.8.0";
+  version = "0.8.0";

  src = fetchFromGitHub {
-    inherit rev;
    owner = "MichaelMure";
    repo = "git-bug";
+    rev = "v${version}";
    sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8";
  };

  vendorSha256 = "sha256-32kNDoBE50Jx1Ef9YwhDk7nd3CaTSnHPlu7PgWPUGfE=";

+  nativeBuildInputs = [ installShellFiles ];
+
  doCheck = false;

+  excludedPackages = [ "doc" "misc" ];
+
  ldflags = [
-    "-X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}"
+    "-X github.com/MichaelMure/git-bug/commands.GitCommit=v${version}"
    "-X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}"
    "-X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}"
  ];

  postInstall = ''
-    install -D -m 0644 misc/completion/bash/git-bug "$out/share/bash-completion/completions/git-bug"
-    install -D -m 0644 misc/completion/zsh/git-bug "$out/share/zsh/site-functions/git-bug"
-    install -D -m 0644 -t "$out/share/man/man1" doc/man/*
+    installShellCompletion \
+      --bash misc/completion/bash/git-bug \
+      --zsh misc/completion/zsh/git-bug \
+      --fish misc/completion/fish/git-bug

-    # not sure why the following executables are in $out/bin/
-    rm -f $out/bin/cmd
-    rm -f $out/bin/completion
-    rm -f $out/bin/doc
+    installManPage doc/man/*
  '';

  meta = with lib; {
    description = "Distributed bug tracker embedded in Git";
    homepage = "https://github.com/MichaelMure/git-bug";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ royneary ];
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ royneary DeeUnderscore ];
  };
 }
--- a/pkgs/applications/version-management/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-machete/default.nix
@ -12,13 +12,13 @@

 buildPythonApplication rec {
  pname = "git-machete";
-  version = "3.13.2";
+  version = "3.14.0";

  src = fetchFromGitHub {
    owner = "virtuslab";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-K9oJvvESHWCJFSgqycA7N4cG7WbTDwXZExnXUs4Qlp8=";
+    hash = "sha256-UgWPm4IxzydO1qqhjbodUIAmqIhTIITYARMvw+F9T7E=";
  };

  nativeBuildInputs = [ installShellFiles ];
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@ -15,13 +15,13 @@

 buildGoModule rec {
  pname = "cri-o";
-  version = "1.26.0";
+  version = "1.26.1";

  src = fetchFromGitHub {
    owner = "cri-o";
    repo = "cri-o";
    rev = "v${version}";
-    sha256 = "sha256-XVg1TBYD6Y/EByKnnD+mFL/qA6IqBohuEvUgjwN962g=";
+    sha256 = "sha256-7tbnnERV+dYtEXzloHgWeSFpe8Dl18tiNWoAhIALWjE=";
  };
  vendorSha256 = null;

--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@ -22,13 +22,14 @@ let
      unwrapped = Agda;
      tests = { inherit (nixosTests) agda; };
    };
+    inherit (Agda) meta;
  } ''
    mkdir -p $out/bin
    makeWrapper ${Agda}/bin/agda $out/bin/agda \
      --add-flags "--with-compiler=${ghc}/bin/ghc" \
      --add-flags "--library-file=${library-file}" \
      --add-flags "--local-interfaces"
-    makeWrapper ${Agda}/bin/agda-mode $out/bin/agda-mode
+    ln -s ${Agda}/bin/agda-mode $out/bin/agda-mode
    ''; # Local interfaces has been added for now: See https://github.com/agda/agda/issues/4526

  withPackages = arg: if builtins.isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; };
--- a/pkgs/data/fonts/martian-mono/default.nix
+++ b/pkgs/data/fonts/martian-mono/default.nix
@ -2,11 +2,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "martian-mono";
-  version = "0.9.2";
+  version = "1.0.0";

  src = fetchzip {
    url = "https://github.com/evilmartians/mono/releases/download/v${version}/martian-mono-${version}-otf.zip";
-    sha256 = "sha256-whIR7BaEflm/VsF60Xck6ZJDLzTugaTOogHzcEtwCsM=";
+    sha256 = "sha256-hC08IHWqg+x3qoEf4EL98ZbGeqdwjnMpDovEiWrWPpI=";
    stripRoot = false;
  };

--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "9f677e1d2267621375d22e3f6c1a25246678be4c",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/9f677e1d2267621375d22e3f6c1a25246678be4c.tar.gz",
-  "sha256": "0y2mbj8dwfgdz5pzdq682clab10xgnqlrfv1najx53yy5jf63pcv",
-  "msg": "Update from Hackage at 2023-01-06T18:29:38Z"
+  "commit": "39a6ef760cb2f514e170dc40e7ec1f7699722e7d",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/39a6ef760cb2f514e170dc40e7ec1f7699722e7d.tar.gz",
+  "sha256": "1s9w4g4dar9blr3vvy9pf18qxcgyvrrdnc65jrkx75gr9dr3247w",
+  "msg": "Update from Hackage at 2023-01-08T15:35:40Z"
 }
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@ -54,13 +54,13 @@

 stdenv.mkDerivation rec {
  pname = "cinnamon-common";
-  version = "5.6.5";
+  version = "5.6.6";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = "cinnamon";
    rev = version;
-    hash = "sha256-UAPzB4Ps/w0VQjbbVl4KMRghwMc4roJR2/ZWkmwOSos=";
+    hash = "sha256-BRknGZOaN156fyETworGIdEiJWrf5uqFD/Nc88LcNcg=";
  };

  patches = [
--- a/pkgs/desktops/cinnamon/xreader/default.nix
+++ b/pkgs/desktops/cinnamon/xreader/default.nix
@ -26,13 +26,13 @@

 stdenv.mkDerivation rec {
  pname = "xreader";
-  version = "3.6.2";
+  version = "3.6.3";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = pname;
    rev = version;
-    sha256 = "sha256-cQ8ofBTOzHD1te2lXuCgJImgK3M1/lXmnh4yL4LfYx4=";
+    sha256 = "sha256-KuCcOnhM8AzKC8hfBpdcnC/ubDVsElKMZuxEnTcJLn0=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/compilers/go/1.18.nix
+++ b/pkgs/development/compilers/go/1.18.nix
@ -45,11 +45,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "go";
-  version = "1.18.9";
+  version = "1.18.10";

  src = fetchurl {
    url = "https://go.dev/dl/go${version}.src.tar.gz";
-    sha256 = "sha256-++fwm5aso9tvrq8YDai7Yyho7ASXMeNV/2FpUZfA4+o=";
+    sha256 = "sha256-nO3MpYhF3wyUdK4AJ0xEqVyd+u+xMvxZkhwox8EG+OY=";
  };

  strictDeps = true;
--- a/pkgs/development/compilers/julia/1.8-bin.nix
+++ b/pkgs/development/compilers/julia/1.8-bin.nix
@ -2,16 +2,16 @@

 stdenv.mkDerivation rec {
  pname = "julia-bin";
-  version = "1.8.4";
+  version = "1.8.5";

  src = {
    x86_64-linux = fetchurl {
      url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
-      sha256 = "sha256-8EJ6TXkQxH3Hwx9lun7Kr+27wOzrOcMgo3+jNZgAT9U=";
+      sha256 = "sha256-5xokgW6P6dX0gHZky7tCc49aqf4FOX01yB1MXWSbnQU=";
    };
    aarch64-linux = fetchurl {
      url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz";
-      sha256 = "sha256-3EeYwc6HaPo1ly6LFJyjqF/GnhB0tgmnKyz+1cSqcFA=";
+      sha256 = "sha256-ofY3tExx6pvJbXw+80dyTAVKHlInuYCt6/wzWZ5RU6Q=";
    };
  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

--- a/pkgs/development/compilers/julia/1.8.nix
+++ b/pkgs/development/compilers/julia/1.8.nix
@ -13,11 +13,11 @@

 stdenv.mkDerivation rec {
  pname = "julia";
-  version = "1.8.4";
+  version = "1.8.5";

  src = fetchurl {
    url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
-    hash = "sha256-HNAyJixcQgSKeBm8zWhOhDu7j2bPn/VsMViB6kMfADM=";
+    hash = "sha256-NVVAgKS0085S7yICVDBr1CrA2I7/nrhVkqV9BmPbXfI=";
  };

  patches = [
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -2095,10 +2095,6 @@ self: super: {
  # https://github.com/zellige/hs-geojson/issues/29
  geojson = dontCheck super.geojson;

-  # Test suite doesn't compile
-  # https://github.com/erebe/wstunnel/issues/145
-  wstunnel = dontCheck super.wstunnel;
-
  # Test data missing from sdist
  # https://github.com/ngless-toolkit/ngless/issues/152
  NGLess = dontCheck super.NGLess;
@ -2319,4 +2315,8 @@ self: super: {
    revision = null;
    editedCabalFile = null;
  }) super.true-name);
+
+  # posix-api has had broken tests since 2020 (until at least 2023-01-11)
+  # raehik has a fix pending: https://github.com/andrewthad/posix-api/pull/14
+  posix-api = dontCheck super.posix-api;
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
@ -181,7 +181,7 @@ in {
  ghc-exactprint = overrideCabal (drv: {
    libraryHaskellDepends = with self; [ HUnit data-default fail filemanip free ghc-paths ordered-containers silently syb Diff ];
  })
-    self.ghc-exactprint_1_6_1;
+    self.ghc-exactprint_1_6_1_1;

  # 2022-10-06: plugins disabled for hls 1.8.0.0 based on
  # https://haskell-language-server.readthedocs.io/en/latest/support/plugin-support.html#current-plugin-support-tiers
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -1093,6 +1093,7 @@ broken-packages:
  - dense
  - dense-int-set
  - dependent-hashmap
+  - dep-t-dynamic
  - deptrack-core
  - dep-t-value
  - derangement
@ -1445,6 +1446,7 @@ broken-packages:
  - fadno-braids
  - fadno-xml
  - failable-list
+  - FailT
  - failure-detector
  - fake
  - fake-type
@ -4080,7 +4082,6 @@ broken-packages:
  - posit
  - positron
  - posix-acl
-  - posix-api
  - posix-realtime
  - posix-waitpid
  - postcodes
@ -4361,6 +4362,7 @@ broken-packages:
  - record-wrangler
  - recursors
  - red-black-record
+  - redis-glob
  - redis-hs
  - redis-simple
  - Redmine
@ -4905,6 +4907,8 @@ broken-packages:
  - socket-activation
  - socketed
  - socketio
+  - sockets
+  - sockets-and-pipes
  - socket-sctp
  - socket-unix
  - sodium
@ -5820,6 +5824,7 @@ broken-packages:
  - X11-rm
  - X11-xdamage
  - X11-xfixes
+  - xcffib
  - xchat-plugin
  - xcp
  - x-dsp
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -673,10 +673,10 @@ dont-distribute-packages:
 - array-forth
 - arraylist
 - ascii-cows
- - ascii-superset_1_2_4_0
+ - ascii-superset_1_2_5_0
 - ascii-table
- - ascii-th_1_1_1_0
- - ascii_1_4_2_0
+ - ascii-th_1_2_0_0
+ - ascii_1_5_1_0
 - asic
 - asil
 - assert4hs-hspec
@ -874,7 +874,6 @@ dont-distribute-packages:
 - bv-sized
 - bv-sized-lens
 - bytable
- - bytelog
 - bytepatch
 - bytestring-builder-varword
 - bytestring-read
@ -1030,6 +1029,7 @@ dont-distribute-packages:
 - comark
 - comfort-array
 - comfort-array-shape
+ - comfort-array_0_5_2
 - comfort-fftw
 - comfort-glpk
 - commsec
@ -3666,7 +3666,6 @@ dont-distribute-packages:
 - snowflake-server
 - sock2stream
 - socket-io
- - sockets
 - socketson
 - solga-swagger
 - solr
@ -3821,6 +3820,7 @@ dont-distribute-packages:
 - synthesizer
 - synthesizer-alsa
 - synthesizer-core
+ - synthesizer-core_0_8_3
 - synthesizer-dimensional
 - synthesizer-filter
 - synthesizer-llvm
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@ -5994,6 +5994,26 @@ self: {
       hydraPlatforms = lib.platforms.none;
     }) {};

+  "FailT" = callPackage
+    ({ mkDerivation, base, doctest, exceptions, hspec, mtl, QuickCheck
+     , quickcheck-classes, text
+     }:
+     mkDerivation {
+       pname = "FailT";
+       version = "0.1.0.0";
+       sha256 = "13ai9w5i3ay3v0skn32fllymnywd77zdr4lvf16k99lnimbzzm6y";
+       revision = "2";
+       editedCabalFile = "1cvw3icblydaid9w74dqaprsp8556zapr4ajw8qi8iw8y3kss891";
+       libraryHaskellDepends = [ base exceptions mtl text ];
+       testHaskellDepends = [
+         base doctest exceptions hspec mtl QuickCheck quickcheck-classes
+       ];
+       description = "A 'FailT' monad transformer that plays well with 'MonadFail'";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
  "FailureT" = callPackage
    ({ mkDerivation, base, base-unicode-symbols, mmtl }:
     mkDerivation {
@ -9998,6 +10018,27 @@ self: {
       license = lib.licenses.bsd3;
     }) {};

+  "HaTeX_3_22_3_2" = callPackage
+    ({ mkDerivation, base, bibtex, bytestring, containers, hashable
+     , matrix, parsec, prettyprinter, QuickCheck, tasty
+     , tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "HaTeX";
+       version = "3.22.3.2";
+       sha256 = "1hxj661nkaylh46xrwddj8zm1gb64714yz7jk1afmy5n4yzsqdzj";
+       libraryHaskellDepends = [
+         base bibtex bytestring containers hashable matrix parsec
+         prettyprinter QuickCheck text transformers
+       ];
+       testHaskellDepends = [
+         base parsec QuickCheck tasty tasty-quickcheck text
+       ];
+       description = "The Haskell LaTeX library";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
  "HaTeX-meta" = callPackage
    ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
     , haddock, haskell-src-exts, mtl, parsec
@ -35110,15 +35151,15 @@ self: {
       license = lib.licenses.asl20;
     }) {};

-  "ascii_1_4_2_0" = callPackage
+  "ascii_1_5_1_0" = callPackage
    ({ mkDerivation, ascii-case, ascii-caseless, ascii-char
     , ascii-group, ascii-numbers, ascii-predicates, ascii-superset
     , ascii-th, base, bytestring, hspec, text
     }:
     mkDerivation {
       pname = "ascii";
-       version = "1.4.2.0";
-       sha256 = "0ql2g9fapm9vzdfpnvax7884cl80s1s61ki98mmy6mjxszlry9jp";
+       version = "1.5.1.0";
+       sha256 = "01a2xrkk60bpbz4x337jp66fy7zhdpb2c649c62inx723cc1q4il";
       libraryHaskellDepends = [
         ascii-case ascii-caseless ascii-char ascii-group ascii-numbers
         ascii-predicates ascii-superset ascii-th base bytestring text
@ -35416,14 +35457,14 @@ self: {
       license = lib.licenses.asl20;
     }) {};

-  "ascii-superset_1_2_4_0" = callPackage
+  "ascii-superset_1_2_5_0" = callPackage
    ({ mkDerivation, ascii-case, ascii-caseless, ascii-char, base
     , bytestring, hashable, hspec, text
     }:
     mkDerivation {
       pname = "ascii-superset";
-       version = "1.2.4.0";
-       sha256 = "0gh7k9fjh5l2a8xdd964gd4fy0lmfz9y0pnfykx7wiqiqirv2v4y";
+       version = "1.2.5.0";
+       sha256 = "00i662bwrsqj34g0d9awgik2vqxxlr8y2v1xyyrhhqh5fi3s0rwk";
       libraryHaskellDepends = [
         ascii-case ascii-caseless ascii-char base bytestring hashable text
       ];
@ -35472,16 +35513,14 @@ self: {
       license = lib.licenses.asl20;
     }) {};

-  "ascii-th_1_1_1_0" = callPackage
+  "ascii-th_1_2_0_0" = callPackage
    ({ mkDerivation, ascii-case, ascii-caseless, ascii-char
     , ascii-superset, base, bytestring, hspec, template-haskell, text
     }:
     mkDerivation {
       pname = "ascii-th";
-       version = "1.1.1.0";
-       sha256 = "1jfjj7rir0bbbasvdb11ymcpjk4zv0br5sk2839hnnlgam9a75g5";
-       revision = "1";
-       editedCabalFile = "06dsa4nrpvy1sm4hr4q6ydgjizf4r7s9xvlc9ra4f8mawsq85zx6";
+       version = "1.2.0.0";
+       sha256 = "07v6795rfwb8h4x31kc7vdmwg9z23jf4418dcv612c27dqhx4hbg";
       libraryHaskellDepends = [
         ascii-case ascii-caseless ascii-char ascii-superset base
         template-haskell
@ -50641,7 +50680,6 @@ self: {
       ];
       description = "Fast logging";
       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
     }) {};

  "byteorder" = callPackage
@ -52696,17 +52734,17 @@ self: {

  "cabal-plan-bounds" = callPackage
    ({ mkDerivation, base, bytestring, cabal-plan, Cabal-syntax
-     , containers, optparse-applicative, text
+     , containers, optparse-applicative, pretty, text
     }:
     mkDerivation {
       pname = "cabal-plan-bounds";
-       version = "0.1.0.1";
-       sha256 = "1s8ljyp8bi0h637abxq4ma2m5bx8cpiw5ib6n50npprycv9h3v04";
+       version = "0.1.3";
+       sha256 = "0bngpl6j5q11axra38802qgyh1crghdq89dsfpfhyllyrkcmwci6";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
         base bytestring cabal-plan Cabal-syntax containers
-         optparse-applicative text
+         optparse-applicative pretty text
       ];
       description = "Derives cabal bounds from build plans";
       license = lib.licenses.bsd2;
@ -63361,6 +63399,30 @@ self: {
       hydraPlatforms = lib.platforms.none;
     }) {};

+  "comfort-array_0_5_2" = callPackage
+    ({ mkDerivation, base, ChasingBottoms, containers, deepseq
+     , doctest-exitcode-stdio, doctest-lib, guarded-allocation
+     , non-empty, prelude-compat, primitive, QuickCheck, semigroups
+     , storable-record, storablevector, tagged, transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "comfort-array";
+       version = "0.5.2";
+       sha256 = "0rpv9mn1jmkb9f89y02zfg2vwz4slzny31yjrvwcm43jhdyvzkwh";
+       libraryHaskellDepends = [
+         base containers deepseq guarded-allocation non-empty prelude-compat
+         primitive QuickCheck semigroups storable-record storablevector
+         tagged transformers utility-ht
+       ];
+       testHaskellDepends = [
+         base ChasingBottoms containers deepseq doctest-exitcode-stdio
+         doctest-lib QuickCheck tagged
+       ];
+       description = "Arrays where the index type is a function of the shape type";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
  "comfort-array-shape" = callPackage
    ({ mkDerivation, base, ChasingBottoms, comfort-array, containers
     , doctest-exitcode-stdio, doctest-lib, fixed-length, non-empty
@ -63413,6 +63475,8 @@ self: {
       pname = "comfort-glpk";
       version = "0.0";
       sha256 = "16cg5bc1a04zz23bhgfai9bgllwdkl975j9l7r9im8l9qn7ah1xy";
+       revision = "1";
+       editedCabalFile = "12d7vmy8nas78gzq2s3a9gbpffbv4afjnkqzrdmgnzj3jkljzc7p";
       libraryHaskellDepends = [
         base comfort-array deepseq glpk-headers non-empty utility-ht
       ];
@ -68618,8 +68682,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot";
-       version = "3.12";
-       sha256 = "0svbn9djzxqbmi62106i2692fx31vdxqjjd2y329nlq36iivvyxf";
+       version = "3.13";
+       sha256 = "1a6r3r1q6vqxmwdj89bmvbzrlkfyyzq6i84ydg756wsvm6mipq7a";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -68637,8 +68701,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-c99";
-       version = "3.12";
-       sha256 = "0xxvdl1k09il545y263k5x37gi5z1y4plm8f4yjqh3hprv23ffhp";
+       version = "3.13";
+       sha256 = "112lmmylylq9jwcj0diy3fqn9kbs8xkyqc9l7n5jjy5h3yak8d2c";
       libraryHaskellDepends = [
         base copilot-core directory filepath language-c99
         language-c99-simple mtl pretty
@ -68665,14 +68729,14 @@ self: {
     }) {};

  "copilot-core" = callPackage
-    ({ mkDerivation, base, dlist, HUnit, pretty, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
+    ({ mkDerivation, base, HUnit, pretty, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
     }:
     mkDerivation {
       pname = "copilot-core";
-       version = "3.12";
-       sha256 = "1aw6pkxqpcwqib86yq2zvjz6jqxjc3ina0hbxsyvmgmcqs5hwybs";
-       libraryHaskellDepends = [ base dlist pretty ];
+       version = "3.13";
+       sha256 = "0i05bpiag7prr3xn361psda7ncfyrgbd6rjsy23rkf4ygmb2908p";
+       libraryHaskellDepends = [ base pretty ];
       testHaskellDepends = [
         base HUnit pretty QuickCheck test-framework test-framework-hunit
         test-framework-quickcheck2
@ -68705,8 +68769,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-interpreter";
-       version = "3.12";
-       sha256 = "100nalpd7q9z26nyk06nbl4hr8p6akm8qny988zd8znp2c3z37rr";
+       version = "3.13";
+       sha256 = "0z03qlafv53sxp50j9ccp1pgfs3nqm4l7m18cxzflzzn6j3bnrjy";
       libraryHaskellDepends = [ base copilot-core pretty ];
       testHaskellDepends = [
         base copilot-core copilot-prettyprinter pretty QuickCheck
@ -68724,8 +68788,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-language";
-       version = "3.12";
-       sha256 = "1n2n83617wi0piw94g843zk39xvralcn7l8vdcvbx6gwqm9dn320";
+       version = "3.13";
+       sha256 = "060lr6m9kp204qyjga6xl879ypv648wm6gh33w10x5jlzghabl4d";
       libraryHaskellDepends = [
         array base containers copilot-core copilot-interpreter
         copilot-prettyprinter copilot-theorem data-reify mtl
@ -68743,8 +68807,8 @@ self: {
    ({ mkDerivation, base, containers, copilot-language, mtl, parsec }:
     mkDerivation {
       pname = "copilot-libraries";
-       version = "3.12";
-       sha256 = "0xxfz2r04x0cwyidlfd792v4jspv38v8w012w0dmr0ajsw15npxb";
+       version = "3.13";
+       sha256 = "05ffpp2h83l0wvddfmi6m42c79qsw07dfmx8bmj2zwfhhikp043r";
       libraryHaskellDepends = [
         base containers copilot-language mtl parsec
       ];
@ -68757,8 +68821,8 @@ self: {
    ({ mkDerivation, base, copilot-core, pretty }:
     mkDerivation {
       pname = "copilot-prettyprinter";
-       version = "3.12";
-       sha256 = "1sj4fjj6kwarjxn53qrfvl0ca200ra9hnh8mrisc4jr87xhdbnh0";
+       version = "3.13";
+       sha256 = "04ivmsrb51j7agmb1nimzxp0srkkv52qi49qxishf8gj4jnhm10p";
       libraryHaskellDepends = [ base copilot-core pretty ];
       description = "A prettyprinter of Copilot Specifications";
       license = lib.licenses.bsd3;
@ -68788,8 +68852,8 @@ self: {
     }:
     mkDerivation {
       pname = "copilot-theorem";
-       version = "3.12";
-       sha256 = "1q0r8fa4jvqpkiy099f9fmrcm2qy0wrvxwkaycbqlhgx1zixxl3z";
+       version = "3.13";
+       sha256 = "0q0pfnaayldy1h62qj25ksfc9v2vyp5aiy3b2lxw436lw2brl4jf";
       libraryHaskellDepends = [
         base bimap bv-sized containers copilot-core copilot-prettyprinter
         data-default directory libBF mtl panic parameterized-utils parsec
@ -77524,8 +77588,8 @@ self: {
     }:
     mkDerivation {
       pname = "deep-transformations";
-       version = "0.2";
-       sha256 = "1kk7h4vys9l0456kaapdg1y1d8lzfkzkb71mc996l2lmrdxvzz5v";
+       version = "0.2.1";
+       sha256 = "0k17v0h5nll73rs03qn5b7lblarzrhmlhk44kx0ipzh4kra55500";
       setupHaskellDepends = [ base Cabal cabal-doctest ];
       libraryHaskellDepends = [
         base generic-lens rank2classes template-haskell transformers
@ -78192,8 +78256,8 @@ self: {
     }:
     mkDerivation {
       pname = "dep-t";
-       version = "0.6.4.0";
-       sha256 = "1xrazkn8pdzkjrcia9ndxiva483w9fyclcq562assnv9j3svi145";
+       version = "0.6.5.0";
+       sha256 = "19jhxcmh6qf3nhixjjp7sqcpn4jpl6cdnaccvfn8375h83v1dbp9";
       libraryHaskellDepends = [ base mtl transformers unliftio-core ];
       testHaskellDepends = [
         aeson barbies base bytestring containers doctest mtl rank2classes
@ -78251,6 +78315,8 @@ self: {
       ];
       description = "A dynamic environment for dependency injection";
       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
     }) {};

  "dep-t-value" = callPackage
@ -78825,6 +78891,19 @@ self: {
       license = lib.licenses.bsd3;
     }) {};

+  "deriving-aeson_0_2_9" = callPackage
+    ({ mkDerivation, aeson, base, bytestring }:
+     mkDerivation {
+       pname = "deriving-aeson";
+       version = "0.2.9";
+       sha256 = "0cqq4ri9dgqkdh9wybf3wf5zxb9nihql591bk1lacnzdyxfrgcn0";
+       libraryHaskellDepends = [ aeson base ];
+       testHaskellDepends = [ aeson base bytestring ];
+       description = "Type driven generic aeson instance customisation";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
  "deriving-compat" = callPackage
    ({ mkDerivation, base, base-compat, base-orphans, containers
     , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
@ -106043,6 +106122,21 @@ self: {
       broken = true;
     }) {};

+  "gambler" = callPackage
+    ({ mkDerivation, base, criterion, hspec }:
+     mkDerivation {
+       pname = "gambler";
+       version = "0.0.0.0";
+       sha256 = "1bbnczw8771jv0ds082r3babf28214p99lx0f97y4hxcsi29f096";
+       revision = "1";
+       editedCabalFile = "12wkc92pdpiks8mn375n2yjkjq9b1n0q6vnyyslf0b58p9b9flgw";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Composable, streaming, and efficient left folds";
+       license = lib.licenses.bsd3;
+     }) {};
+
  "game-of-life" = callPackage
    ({ mkDerivation, array, base, hscurses, hspec, random, text }:
     mkDerivation {
@ -109784,12 +109878,12 @@ self: {
       license = lib.licenses.bsd3;
     }) {};

-  "ghc-exactprint_1_6_1" = callPackage
+  "ghc-exactprint_1_6_1_1" = callPackage
    ({ mkDerivation }:
     mkDerivation {
       pname = "ghc-exactprint";
-       version = "1.6.1";
-       sha256 = "1ihr3mffcm0z4plkgysiki5l225ayrxgjfjqx37ysqgp7vvnsr08";
+       version = "1.6.1.1";
+       sha256 = "0dzl5nhiwi6a5jq226qjq0vlb70iq50hk0kv0h675j4pr93v50w8";
       isLibrary = true;
       isExecutable = true;
       description = "ExactPrint for GHC";
@ -115295,20 +115389,15 @@ self: {
     }) {};

  "glpk-headers" = callPackage
-    ({ mkDerivation, base, derive-storable, glpk, tasty, tasty-discover
-     , tasty-hunit
-     }:
+    ({ mkDerivation, base, derive-storable, glpk, hspec }:
     mkDerivation {
       pname = "glpk-headers";
-       version = "0.4.1";
-       sha256 = "1r77p0h9iyffl903ag008cb3v21jw021129cfxpr2mp1mgnkhdjd";
+       version = "0.5.0";
+       sha256 = "1v9wq6y4qa6m5l6z27rwgjk0s7q8gklq05djmqspm6c456f1z2q5";
       libraryHaskellDepends = [ base derive-storable ];
-       testHaskellDepends = [
-         base derive-storable tasty tasty-discover tasty-hunit
-       ];
-       testSystemDepends = [ glpk ];
-       testToolDepends = [ tasty-discover ];
-       description = "Low-level Haskell bindings to GLPK";
+       librarySystemDepends = [ glpk ];
+       testHaskellDepends = [ base hspec ];
+       description = "Low-level Haskell bindings to the GLPK library";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@ -135008,6 +135097,26 @@ self: {
       license = lib.licenses.bsd3;
     }) {};

+  "hedgehog-extras" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring
+     , deepseq, directory, exceptions, filepath, hedgehog, hw-aeson
+     , mmorph, mtl, network, process, resourcet, stm, temporary, text
+     , time, transformers, unliftio, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "hedgehog-extras";
+       version = "0.3.0.2";
+       sha256 = "1bf6fyvp2vzvm7z9ny1pcnaqqxqh9j42x6jyd2r8mv3dxdfdjkhr";
+       libraryHaskellDepends = [
+         aeson aeson-pretty async base bytestring deepseq directory
+         exceptions filepath hedgehog hw-aeson mmorph mtl network process
+         resourcet stm temporary text time transformers unliftio
+         unordered-containers yaml
+       ];
+       description = "Supplemental library for hedgehog";
+       license = lib.licenses.asl20;
+     }) {};
+
  "hedgehog-fakedata" = callPackage
    ({ mkDerivation, base, containers, fakedata, hedgehog, random }:
     mkDerivation {
@ -149328,14 +149437,14 @@ self: {
       license = lib.licenses.mit;
     }) {};

-  "hslua-module-text_1_0_3" = callPackage
+  "hslua-module-text_1_0_3_1" = callPackage
    ({ mkDerivation, base, hslua-core, hslua-marshalling
     , hslua-packaging, tasty, tasty-hunit, tasty-lua, text
     }:
     mkDerivation {
       pname = "hslua-module-text";
-       version = "1.0.3";
-       sha256 = "0gbdsld1f1qwkb311ll7c9mrvnjf7mfqfcgc9n3cnc8l5264s6kv";
+       version = "1.0.3.1";
+       sha256 = "025n8vmaq22bl1x60hpg57ih44g6z71jc1qnlxfsi06hram1wcqc";
       libraryHaskellDepends = [
         base hslua-core hslua-marshalling hslua-packaging text
       ];
@ -152609,6 +152718,8 @@ self: {
       pname = "http-client";
       version = "0.7.13.1";
       sha256 = "09qfmakjk285jz2rnb53c1m9c764fg8vngfq43ipga1g72h8d3n9";
+       revision = "1";
+       editedCabalFile = "168nbb80kcxyz59sz4mnaydpag5flq32y9ikfxa1jygj8j8p9034";
       libraryHaskellDepends = [
         array async base base64-bytestring blaze-builder bytestring
         case-insensitive containers cookie deepseq exceptions filepath
@ -196845,8 +196956,8 @@ self: {
     }:
     mkDerivation {
       pname = "mu-graphql";
-       version = "0.5.0.3";
-       sha256 = "1ahi51sslxlmv4yi6518bn3i4ks7hpc8327r6lz0l6d4q192k1nq";
+       version = "0.5.0.4";
+       sha256 = "0xazfpl6xy6j67a4mjgp09akyvlfi2r26b193d8p9rra1hn09334";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@ -197409,13 +197520,13 @@ self: {
     }) {};

  "multicurryable" = callPackage
-    ({ mkDerivation, base, sop-core }:
+    ({ mkDerivation, base, doctest, sop-core }:
     mkDerivation {
       pname = "multicurryable";
-       version = "0.1.0.0";
-       sha256 = "0p0wlz44scvkxzdhd059ivrhz4bsgbml26a8fm7jsav80cwbdfc4";
+       version = "0.1.0.1";
+       sha256 = "1d75pksld6cd9p39avjq54qcb0lhjgm8b78hl1521df17c1yi5y6";
       libraryHaskellDepends = [ base sop-core ];
-       testHaskellDepends = [ base sop-core ];
+       testHaskellDepends = [ base doctest sop-core ];
       description = "Uncurry functions with multiple arguments";
       license = lib.licenses.bsd3;
     }) {};
@ -200881,6 +200992,40 @@ self: {
       license = lib.licenses.bsd3;
     }) {};

+  "net-mqtt_0_8_2_5" = callPackage
+    ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary
+     , bytestring, checkers, conduit, conduit-extra, connection
+     , containers, deepseq, HUnit, network-conduit-tls, network-uri
+     , optparse-applicative, QuickCheck, stm, tasty, tasty-hunit
+     , tasty-quickcheck, text, websockets
+     }:
+     mkDerivation {
+       pname = "net-mqtt";
+       version = "0.8.2.5";
+       sha256 = "0k6yghgj693hbyk2zsjh3ns1yx9ypjjfj3mrrandn6lvpif08h9x";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async attoparsec attoparsec-binary base binary bytestring conduit
+         conduit-extra connection containers deepseq network-conduit-tls
+         network-uri QuickCheck stm text websockets
+       ];
+       executableHaskellDepends = [
+         async attoparsec attoparsec-binary base binary bytestring conduit
+         conduit-extra connection containers deepseq network-conduit-tls
+         network-uri optparse-applicative QuickCheck stm text websockets
+       ];
+       testHaskellDepends = [
+         async attoparsec attoparsec-binary base binary bytestring checkers
+         conduit conduit-extra connection containers deepseq HUnit
+         network-conduit-tls network-uri QuickCheck stm tasty tasty-hunit
+         tasty-quickcheck text websockets
+       ];
+       description = "An MQTT Protocol Implementation";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
  "net-mqtt-lens" = callPackage
    ({ mkDerivation, base, HUnit, lens, net-mqtt, tasty, tasty-hunit
     , tasty-quickcheck
@ -225031,8 +225176,6 @@ self: {
       description = "posix bindings";
       license = lib.licenses.bsd3;
       badPlatforms = lib.platforms.darwin;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
     }) {inherit (pkgs) systemd;};

  "posix-error-codes" = callPackage
@ -238539,16 +238682,16 @@ self: {
     }:
     mkDerivation {
       pname = "redis-glob";
-       version = "0.1.0.3";
-       sha256 = "11cq30hl284cqgbsy5n4nn9aq7y84cca4skkv0ib9b6ddn97gbkf";
-       libraryHaskellDepends = [
-         ascii-char ascii-superset base bytestring megaparsec
-       ];
+       version = "0.1.0.4";
+       sha256 = "0w1w76ldiaxk4irgazm6xv5s60zvyyvjfsxbpa3b0aq4jgw49gh5";
+       libraryHaskellDepends = [ ascii-char base bytestring megaparsec ];
       testHaskellDepends = [
         ascii-char ascii-superset base bytestring hspec QuickCheck
       ];
       description = "Specify valid redis globs";
       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
     }) {};

  "redis-hs" = callPackage
@ -248606,6 +248749,20 @@ self: {
       license = lib.licenses.bsd3;
     }) {};

+  "sample-frame_0_0_4" = callPackage
+    ({ mkDerivation, base, QuickCheck, storable-record }:
+     mkDerivation {
+       pname = "sample-frame";
+       version = "0.0.4";
+       sha256 = "105hbd7s870vcjx49gk395craa4slcrngara8q3zfwn1cdpig49c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base QuickCheck storable-record ];
+       description = "Handling of samples in an (audio) signal";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
  "sample-frame-np" = callPackage
    ({ mkDerivation, base, numeric-prelude, sample-frame }:
     mkDerivation {
@ -248617,6 +248774,18 @@ self: {
       license = lib.licenses.bsd3;
     }) {};

+  "sample-frame-np_0_0_5" = callPackage
+    ({ mkDerivation, base, numeric-prelude, sample-frame }:
+     mkDerivation {
+       pname = "sample-frame-np";
+       version = "0.0.5";
+       sha256 = "0h02bn5zr13agpv2wg4sp6hjlid25ylny8xswrk42pzp0jsph8mn";
+       libraryHaskellDepends = [ base numeric-prelude sample-frame ];
+       description = "Orphan instances for types from sample-frame and numericprelude";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
  "sampling" = callPackage
    ({ mkDerivation, base, containers, criterion, foldl, mwc-random
     , primitive, vector
@ -265357,6 +265526,7 @@ self: {
       description = "High-level network sockets";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+       broken = true;
     }) {};

  "sockets-and-pipes" = callPackage
@ -265369,8 +265539,8 @@ self: {
       pname = "sockets-and-pipes";
       version = "0.3";
       sha256 = "0hlq64nh7iw7brn11j7xhy1zcmk0iczarg7ig7z2i7ny11czi73l";
-       revision = "2";
-       editedCabalFile = "02vwkv8qvm270rybn68yb6n7z387g1bv2iwn4pa397l94225ny7l";
+       revision = "4";
+       editedCabalFile = "0b7vn23r6v6s9lc2ghajbw3ci2h4wm7i07rsrwk3i4fdkp3g7dd2";
       libraryHaskellDepends = [
         aeson ascii async attoparsec base blaze-html bytestring containers
         directory filepath list-transformer network network-simple relude
@ -265378,6 +265548,8 @@ self: {
       ];
       description = "Support for the Sockets and Pipes book";
       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
     }) {};

  "socketson" = callPackage
@ -274644,8 +274816,8 @@ self: {
    ({ mkDerivation, base, generics-sop, profunctors, vector }:
     mkDerivation {
       pname = "summer";
-       version = "0.3.7.1";
-       sha256 = "0g745i3ms1i6qz428aln33hczvgn1zg79xd0n94h696x397d7zs5";
+       version = "0.3.7.2";
+       sha256 = "0dqjvq1h116x3pbmi27nlgwp6sq5w8d6clcvbw9nlb85cn6awr4y";
       libraryHaskellDepends = [ base generics-sop profunctors vector ];
       testHaskellDepends = [ base ];
       description = "An implementation of extensible products and sums";
@ -277392,6 +277564,39 @@ self: {
       hydraPlatforms = lib.platforms.none;
     }) {};

+  "synthesizer-core_0_8_3" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , deepseq, directory, event-list, explicit-exception, filepath
+     , non-empty, non-negative, numeric-prelude, numeric-quest, old-time
+     , process, QuickCheck, random, sample-frame-np, semigroups, sox
+     , storable-record, storable-tuple, storablevector, timeit
+     , transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "synthesizer-core";
+       version = "0.8.3";
+       sha256 = "0a12qmr7fdlz5mbrki9nd1fl07670hll3wrdpp1apvf6zd36h7mn";
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq event-list
+         explicit-exception filepath non-empty non-negative numeric-prelude
+         numeric-quest process QuickCheck random sample-frame-np semigroups
+         sox storable-record storable-tuple storablevector transformers
+         utility-ht
+       ];
+       testHaskellDepends = [
+         base containers event-list non-empty non-negative numeric-prelude
+         QuickCheck random storable-tuple storablevector transformers
+         utility-ht
+       ];
+       benchmarkHaskellDepends = [
+         array base binary bytestring directory numeric-prelude old-time
+         storable-tuple storablevector timeit utility-ht
+       ];
+       description = "Audio signal processing coded in Haskell: Low level part";
+       license = "GPL";
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
  "synthesizer-dimensional" = callPackage
    ({ mkDerivation, base, bytestring, event-list, non-negative
     , numeric-prelude, random, semigroups, sox, storable-record
@ -277899,8 +278104,8 @@ self: {
     }:
     mkDerivation {
       pname = "systemd-socket-activation";
-       version = "1.0.0.1";
-       sha256 = "1czps42qaxghg3mbr7v847j1yqgk79lbx1b5dmi5mnyg3869dq81";
+       version = "1.0.0.2";
+       sha256 = "1shqkxa8wgnx3bndy3qgykb4l0jsrp4qpwahgy9r6n98a1idbx0v";
       libraryHaskellDepends = [
         base containers network text transformers unix
       ];
@ -279558,8 +279763,8 @@ self: {
     }:
     mkDerivation {
       pname = "tasty-checklist";
-       version = "1.0.4.1";
-       sha256 = "0l281cj18m35zv52s276s8vgrwsd6plykrcs0ivb0jixy898lppk";
+       version = "1.0.5.0";
+       sha256 = "0661qpzdb9bdjd7k0j6lhfgnmkdcf3xjv66q6lfcvsdw2nvvp48n";
       libraryHaskellDepends = [
         base exceptions parameterized-utils text
       ];
@ -289799,14 +290004,12 @@ self: {
       mainProgram = "Benchmark";
     }) {};

-  "transformers_0_6_0_4" = callPackage
+  "transformers_0_6_0_5" = callPackage
    ({ mkDerivation, base }:
     mkDerivation {
       pname = "transformers";
-       version = "0.6.0.4";
-       sha256 = "1jw9c89yri37hsai6jgckfdana1gqjr15xnanxzm3vahvgcb5f1s";
-       revision = "1";
-       editedCabalFile = "0j369jl6y2p3gyhhxyr24x7dbdgvlgnnfxjb63f9gkb9b11rbq3q";
+       version = "0.6.0.5";
+       sha256 = "09s4svr1z1y93qwzq22py0s2s35b6lyszyfippiimccqrbk1jlsm";
       libraryHaskellDepends = [ base ];
       description = "Concrete functor and monad transformers";
       license = lib.licenses.bsd3;
@ -301414,8 +301617,8 @@ self: {
     }:
     mkDerivation {
       pname = "verset";
-       version = "0.0.1.7";
-       sha256 = "12bbadznnp4pksy1yb7lw4zniksnaz7ipmfyji0ak6b0bqfh74s2";
+       version = "0.0.1.8";
+       sha256 = "19l5ck1l1528f7mqks5c6n314cyzrw5qk2ddg77s6y6lv5sm4kv3";
       libraryHaskellDepends = [
         base bytestring containers extra mtl safe text time uuid
       ];
@ -309564,8 +309767,8 @@ self: {
     }:
     mkDerivation {
       pname = "wstunnel";
-       version = "0.5.0.0";
-       sha256 = "0qm6n009p9lyb5iy5rbrlwvcfcqdnlpxvc5cy02f3xyf9h8ikwkp";
+       version = "0.5.1.0";
+       sha256 = "10iac65sg2h6azj99gpz8p9hxs38sf675mq1f83rrjvc5zanhm2c";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -310136,8 +310339,8 @@ self: {
    ({ mkDerivation, base, containers, mtl, pretty, xml }:
     mkDerivation {
       pname = "xcb-types";
-       version = "0.11.0";
-       sha256 = "1yhf1gh23ccvhkx8xbmiaa24r1mrilyvq3fwa15h8imf7qfvmr6x";
+       version = "0.12.0";
+       sha256 = "0w3q0qclpjdy51jdd761ykz48l5sm3q6jjy8igaf3yhsdzzg79fw";
       libraryHaskellDepends = [ base containers mtl pretty xml ];
       description = "Parses XML files used by the XCB project";
       license = lib.licenses.bsd3;
@ -310169,7 +310372,9 @@ self: {
       ];
       description = "A cffi-based python binding for X";
       license = "unknown";
+       hydraPlatforms = lib.platforms.none;
       mainProgram = "xcffibgen";
+       broken = true;
     }) {};

  "xchat-plugin" = callPackage
--- a/pkgs/development/libraries/agda/cubical/default.nix
+++ b/pkgs/development/libraries/agda/cubical/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "cubical";
-  version = "0.4prec3e097a";
+  version = "0.4";

  src = fetchFromGitHub {
    repo = pname;
    owner = "agda";
-    rev = "c3e097a98c84083550fa31101346bd42a0501add";
-    sha256 = "101cni2a9xvia1mglb94z61jm8xk9r5kc1sn44cri0qsmk1zbqxs";
+    rev = "v${version}";
+    hash = "sha256-bnHz5uZXZnn1Zd36tq/veA4yT7dhJ1c+AYpgdDfSRzE=";
  };

  LC_ALL = "en_US.UTF-8";
--- a/pkgs/development/libraries/calcium/default.nix
+++ b/pkgs/development/libraries/calcium/default.nix
@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, mpir
+, gmp
+, mpfr
+, flint
+, arb
+, antic
+}:
+
+stdenv.mkDerivation rec {
+  pname = "calcium";
+  version = "0.4.1";
+
+  src = fetchFromGitHub {
+    owner = "fredrik-johansson";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-Ony2FGMnWyNqD7adGeiDtysHNZ4ClMvQ1ijVPSHJmyc=";
+  };
+
+  buildInputs = [ mpir gmp mpfr flint arb antic ];
+
+  configureFlags = [
+    "--with-gmp=${gmp}"
+    "--with-mpir=${mpir}"
+    "--with-mpfr=${mpfr}"
+    "--with-flint=${flint}"
+    "--with-arb=${arb}"
+    "--with-antic=${antic}"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "A C library for exact computation with real and complex numbers";
+    homepage = "https://fredrikj.net/calcium/";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ smasher164 ];
+    platforms = platforms.unix;
+  };
+}
--- a/pkgs/development/libraries/hivex/default.nix
+++ b/pkgs/development/libraries/hivex/default.nix
@ -1,5 +1,6 @@
-{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper
-, perlPackages, libxml2, libintl }:
+{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper, perlPackages
+, ocamlPackages, libxml2, libintl
+}:

 stdenv.mkDerivation rec {
  pname = "hivex";
@ -12,13 +13,22 @@ stdenv.mkDerivation rec {

  patches = [ ./hivex-syms.patch ];

-  nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];
+  postPatch = ''
+    substituteInPlace ocaml/Makefile.am \
+        --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib'
+  '';
+
+  strictDeps = true;
+  nativeBuildInputs = [ autoreconfHook makeWrapper perlPackages.perl pkg-config ]
+  ++ (with ocamlPackages; [ ocaml findlib ]);
  buildInputs = [
    libxml2
  ]
  ++ (with perlPackages; [ perl IOStringy ])
  ++ lib.optionals stdenv.isDarwin [ libintl ];

+  enableParallelBuilding = true;
+
  postInstall = ''
    wrapProgram $out/bin/hivexregedit \
        --set PERL5LIB "$out/${perlPackages.perl.libPrefix}" \
@ -30,7 +40,7 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "Windows registry hive extraction library";
-    license = licenses.lgpl2;
+    license = licenses.lgpl2Only;
    homepage = "https://github.com/libguestfs/hivex";
    maintainers = with maintainers; [offline];
    platforms = platforms.unix;
--- a/pkgs/development/libraries/libdeltachat/default.nix
+++ b/pkgs/development/libraries/libdeltachat/default.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation rec {
  pname = "libdeltachat";
-  version = "1.105.0";
+  version = "1.106.0";

  src = fetchFromGitHub {
    owner = "deltachat";
    repo = "deltachat-core-rust";
    rev = version;
-    hash = "sha256-WdTCMuGlg072j6fNZ1sey8EKL47BsdKh3SQ5a++Y34I=";
+    hash = "sha256-S53ghVFb1qDI7MVNbc2ZlHqDN4VRBFQJCJg2J+w0erc=";
  };

  patches = [
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-K1DMQ0FHUbyn/cVHKuTBusve0f5SIq1YuGH3cZYealE=";
+    hash = "sha256-k4j814Ao7FAyd0w1nH2fuX1cJKjBkhPw0CVZqNU7Hqs=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/libpg_query/default.nix
+++ b/pkgs/development/libraries/libpg_query/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "libpg_query";
-  version = "15-4.0.0";
+  version = "15-4.1.0";

  src = fetchFromGitHub {
    owner = "pganalyze";
    repo = "libpg_query";
    rev = version;
-    sha256 = "sha256-2BZT/jGfGwia+Map5OkeTcWVFJssykhrdRT2IDAzrfs=";
+    hash = "sha256-uZdszDE0UJVeegU1bi0ISYooC4ztNv7W4UQ2gWIjrH8=";
  };

  nativeBuildInputs = [ which ];
--- a/pkgs/development/libraries/libva/utils.nix
+++ b/pkgs/development/libraries/libva/utils.nix
@ -4,13 +4,13 @@

 stdenv.mkDerivation rec {
  pname = "libva-utils";
-  version = "2.16.0";
+  version = "2.17.0";

  src = fetchFromGitHub {
    owner  = "intel";
    repo   = "libva-utils";
    rev    = version;
-    sha256 = "sha256-6gjOheppHGTHUoT+pVJ6Tfgj9qDB+/MjaI3Win4ULRM=";
+    sha256 = "sha256-zv62Jznifw3GG5n8CIE7rJu0POx0aT8btO9N6CoBfAE=";
  };

  nativeBuildInputs = [ meson ninja pkg-config ];
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix
@ -23,6 +23,7 @@
 , double-conversion
 , util-linux
 , systemd
+, systemdSupport ? stdenv.isLinux
 , libb2
 , md4c
 , mtdev
@ -129,7 +130,9 @@ stdenv.mkDerivation rec {
    unixODBCDrivers.mariadb
  ] ++ lib.optionals stdenv.isLinux [
    util-linux
+  ] ++ lib.optionals systemdSupport [
    systemd
+  ] ++ [
    mtdev
    lksctp-tools
    libselinux
@ -219,7 +222,7 @@ stdenv.mkDerivation rec {
    "-DQT_FEATURE_openssl_linked=ON"
  ] ++ lib.optionals (!stdenv.isDarwin) [
    "-DQT_FEATURE_sctp=ON"
-    "-DQT_FEATURE_journald=ON"
+    "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}"
    "-DQT_FEATURE_vulkan=ON"
  ] ++ lib.optionals stdenv.isDarwin [
    # build as a set of dynamic libraries
--- a/pkgs/development/libraries/utf8cpp/default.nix
+++ b/pkgs/development/libraries/utf8cpp/default.nix
@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "utf8cpp";
-  version = "3.2.2";
+  version = "3.2.3";

  src = fetchFromGitHub {
    owner = "nemtrif";
    repo = "utfcpp";
    rev = "v${version}";
    fetchSubmodules = true;
-    sha256 = "sha256-L58OMNrKd1+yco0V/jpOfWgDr0K1y8jOJ3TasUMRw0k=";
+    sha256 = "sha256-PnHbbjsryRwMMu517ta18qNgwOM6hRnVmXmR3fzS1+4=";
  };

  cmakeFlags = [
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@ -440,6 +440,26 @@ final: prev: {
    '';
  };

+  readability-cli = prev.readability-cli.override (oldAttrs: {
+    # Wrap src to fix this build error:
+    # > readability-cli/readable.ts: unsupported interpreter directive "#!/usr/bin/env -S deno..."
+    #
+    # Need to wrap the source, instead of patching in patchPhase, because
+    # buildNodePackage only unpacks sources in the installPhase.
+    src = pkgs.srcOnly {
+      src = oldAttrs.src;
+      name = oldAttrs.name;
+      patchPhase = "chmod a-x readable.ts";
+    };
+
+    nativeBuildInputs = [ pkgs.pkg-config ];
+    buildInputs = with pkgs; [
+      pixman
+      cairo
+      pango
+    ];
+  });
+
  reveal-md = prev.reveal-md.override (
    lib.optionalAttrs (!stdenv.isDarwin) {
      nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
@ -561,8 +581,7 @@ final: prev: {
  typescript-language-server = prev.typescript-language-server.override {
    nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
    postInstall = ''
-      wrapProgram "$out/bin/typescript-language-server" \
-        --suffix PATH : ${lib.makeBinPath [ final.typescript ]}
+      ${pkgs.xorg.lndir}/bin/lndir ${final.typescript} $out
    '';
  };

--- a/pkgs/development/ocaml-modules/bjack/default.nix
+++ b/pkgs/development/ocaml-modules/bjack/default.nix
@ -1,4 +1,4 @@
-{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libsamplerate, libjack2 }:
+{ lib, stdenv, buildDunePackage, fetchFromGitHub, Accelerate, CoreAudio, dune-configurator, libsamplerate, libjack2 }:

 buildDunePackage rec {
  pname = "bjack";
@ -13,7 +13,7 @@ buildDunePackage rec {
    sha256 = "1gf31a8i9byp6npn0x6gydcickn6sf5dnzmqr2c1b9jn2nl7334c";
  };

-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ];
  propagatedBuildInputs = [ libsamplerate libjack2 ];

  meta = with lib; {
--- a/pkgs/development/ocaml-modules/cohttp/async.nix
+++ b/pkgs/development/ocaml-modules/cohttp/async.nix
@ -28,6 +28,8 @@ buildDunePackage {
    src
    ;

+  duneVersion = "3";
+
  buildInputs = [ ppx_sexp_conv ];

  propagatedBuildInputs = [
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@ -9,6 +9,7 @@ buildDunePackage rec {
  version = "5.0.0";

  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  src = fetchurl {
    url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz";
--- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
@ -9,6 +9,8 @@ buildDunePackage {
  pname = "cohttp-lwt-unix";
  inherit (cohttp-lwt) version src;

+  duneVersion = "3";
+
  buildInputs = [ cmdliner ppx_sexp_conv ];

  propagatedBuildInputs = [
--- a/pkgs/development/ocaml-modules/cohttp/lwt.nix
+++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix
@ -7,6 +7,8 @@ buildDunePackage {
    src
    ;

+  duneVersion = "3";
+
  buildInputs = [ ppx_sexp_conv ];

  propagatedBuildInputs = [
--- a/pkgs/development/ocaml-modules/cohttp/mirage.nix
+++ b/pkgs/development/ocaml-modules/cohttp/mirage.nix
@ -10,6 +10,8 @@ buildDunePackage {

  inherit (cohttp) version src;

+  duneVersion = "3";
+
  nativeBuildInputs = [ ppx_sexp_conv ];

  propagatedBuildInputs = [
--- a/pkgs/development/ocaml-modules/conduit/async.nix
+++ b/pkgs/development/ocaml-modules/conduit/async.nix
@ -9,6 +9,8 @@ buildDunePackage {
    src
    ;

+  duneVersion = "3";
+
  buildInputs = [ ppx_sexp_conv ppx_here ];

  propagatedBuildInputs = [
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@ -7,7 +7,8 @@ buildDunePackage rec {
  pname = "conduit";
  version = "6.1.0";

-  minimalOCamlVersion = "4.03";
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  src = fetchurl {
    url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-${version}.tbz";
--- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@ -6,6 +6,7 @@
 buildDunePackage {
  pname = "conduit-lwt-unix";
  inherit (conduit-lwt) version src;
+  duneVersion = "3";

  buildInputs = [ ppx_sexp_conv ];

--- a/pkgs/development/ocaml-modules/conduit/lwt.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt.nix
@ -3,6 +3,7 @@
 buildDunePackage {
  pname = "conduit-lwt";
  inherit (conduit) version src;
+  duneVersion = "3";

  buildInputs = [ ppx_sexp_conv ];

--- a/pkgs/development/ocaml-modules/conduit/mirage.nix
+++ b/pkgs/development/ocaml-modules/conduit/mirage.nix
@ -9,6 +9,7 @@ buildDunePackage {
  pname = "conduit-mirage";

  inherit (conduit-lwt) version src;
+  duneVersion = "3";

  nativeBuildInputs = [ ppx_sexp_conv ];

--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@ -2,7 +2,8 @@

 buildDunePackage rec {
  pname = "cryptokit";
-  version = "1.17";
+  version = "1.18";
+  duneVersion = "3";

  minimalOCamlVersion = "4.08";

@ -10,7 +11,7 @@ buildDunePackage rec {
    owner = "xavierleroy";
    repo = "cryptokit";
    rev = "release${lib.replaceStrings ["."] [""] version}";
-    sha256 = "sha256:1xi7kcigxkfridjas2zwldsfc21wi31cgln071sbmv4agh3dqbyw";
+    hash = "sha256-8ae8hroCSkp4O5vM/qVOhAnnJJ+uygMYm3ix5ytwtHU=";
  };

  # dont do autotools configuration, but do trigger findlib's preConfigure hook
--- a/pkgs/development/ocaml-modules/curly/default.nix
+++ b/pkgs/development/ocaml-modules/curly/default.nix
@ -6,13 +6,13 @@ buildDunePackage rec {
  pname = "curly";
  version = "0.2.0";

-  minimumOCamlVersion = "4.02";
+  minimalOCamlVersion = "4.02";

-  useDune2 = true;
+  duneVersion = "3";

  src = fetchurl {
    url = "https://github.com/rgrinberg/curly/releases/download/${version}/curly-${version}.tbz";
-    sha256 = "07vqdrklar0d5i83ip7sjw2c1v18a9m3anw07vmi5ay29pxzal6k";
+    hash = "sha256-01D1+03CqxLrPoBbNWpSKOzABJf63DhQLA1kRWdueB8=";
  };

  propagatedBuildInputs = [ result ];
--- a/pkgs/development/ocaml-modules/dns/certify.nix
+++ b/pkgs/development/ocaml-modules/dns/certify.nix
@ -8,6 +8,7 @@ buildDunePackage {
  pname = "dns-certify";

  inherit (dns) version src;
+  duneVersion = "3";

  propagatedBuildInputs = [
    dns
--- a/pkgs/development/ocaml-modules/dns/cli.nix
+++ b/pkgs/development/ocaml-modules/dns/cli.nix
@ -10,6 +10,7 @@ buildDunePackage {
  minimalOCamlVersion = "4.08";

  inherit (dns) version src;
+  duneVersion = "3";

  # no need to propagate as this is primarily
  # an executable package
--- a/pkgs/development/ocaml-modules/dns/client.nix
+++ b/pkgs/development/ocaml-modules/dns/client.nix
@ -10,6 +10,7 @@
 buildDunePackage {
  pname = "dns-client";
  inherit (dns) src version;
+  duneVersion = "3";

  propagatedBuildInputs = [ cstruct fmt logs dns randomconv domain-name ipaddr
                            lwt mirage-random mirage-time mirage-clock
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@ -5,13 +5,14 @@

 buildDunePackage rec {
  pname = "dns";
-  version = "6.3.0";
+  version = "6.4.1";

  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  src = fetchurl {
    url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
-    sha256 = "sha256-3EAjenN9EIi4PsXCZDevmEPDaS4xbESbcbB7pFgwc1E=";
+    hash = "sha256-omG0fKZAHGc+4ERC8cyK47jeEkiBZkB+1fz46j6SDno=";
  };

  propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ];
--- a/pkgs/development/ocaml-modules/dns/dnssec.nix
+++ b/pkgs/development/ocaml-modules/dns/dnssec.nix
@ -7,6 +7,7 @@ buildDunePackage {
  pname = "dnssec";

  inherit (dns) version src;
+  duneVersion = "3";

  propagatedBuildInputs = [
    cstruct
--- a/pkgs/development/ocaml-modules/dns/mirage.nix
+++ b/pkgs/development/ocaml-modules/dns/mirage.nix
@ -4,6 +4,7 @@ buildDunePackage {
  pname = "dns-mirage";

  inherit (dns) version src;
+  duneVersion = "3";

  propagatedBuildInputs = [
    dns
--- a/pkgs/development/ocaml-modules/dns/resolver.nix
+++ b/pkgs/development/ocaml-modules/dns/resolver.nix
@ -8,6 +8,7 @@ buildDunePackage {
  pname = "dns-resolver";

  inherit (dns) version src;
+  duneVersion = "3";

  propagatedBuildInputs = [
    dns
--- a/pkgs/development/ocaml-modules/dns/server.nix
+++ b/pkgs/development/ocaml-modules/dns/server.nix
@ -7,6 +7,7 @@ buildDunePackage {
  pname = "dns-server";

  inherit (dns) version src;
+  duneVersion = "3";

  propagatedBuildInputs = [
    dns
--- a/pkgs/development/ocaml-modules/dns/stub.nix
+++ b/pkgs/development/ocaml-modules/dns/stub.nix
@ -7,6 +7,7 @@ buildDunePackage {
  pname = "dns-stub";

  inherit (dns) version src;
+  duneVersion = "3";

  propagatedBuildInputs = [
    dns
--- a/pkgs/development/ocaml-modules/dns/tsig.nix
+++ b/pkgs/development/ocaml-modules/dns/tsig.nix
@ -4,6 +4,7 @@ buildDunePackage {
  pname = "dns-tsig";

  inherit (dns) version src;
+  duneVersion = "3";

  propagatedBuildInputs = [
    mirage-crypto
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix
@ -1,6 +1,10 @@
 { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AudioToolbox
 , ffmpeg-base ? callPackage ./base.nix { }
-, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg }:
+, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg
+, stdenv
+, VideoToolbox
+}:

 buildDunePackage {
  pname = "ffmpeg-av";
@ -10,7 +14,7 @@ buildDunePackage {
  inherit (ffmpeg-base) version src useDune2;

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];
  propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix
@ -1,6 +1,9 @@
 { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AudioToolbox
 , ffmpeg-base ? callPackage ./base.nix { }
 , ffmpeg-avutil, ffmpeg
+, stdenv
+, VideoToolbox
 }:

 buildDunePackage {
@ -11,7 +14,8 @@ buildDunePackage {
  inherit (ffmpeg-base) version src useDune2;

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ]
+    ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];
  propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix
@ -1,6 +1,14 @@
 { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AppKit
+, AudioToolbox
+, Cocoa
+, CoreImage
+, ForceFeedback
 , ffmpeg-base ? callPackage ./base.nix { }
 , ffmpeg-av, ffmpeg
+, OpenGL
+, stdenv
+, VideoToolbox
 }:

 buildDunePackage {
@ -11,7 +19,8 @@ buildDunePackage {
  inherit (ffmpeg-base) version src useDune2;

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ]
+    ++ lib.optionals stdenv.isDarwin [ AppKit AudioToolbox Cocoa CoreImage ForceFeedback OpenGL VideoToolbox ];
  propagatedBuildInputs = [ ffmpeg-av ffmpeg.dev ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix
@ -1,6 +1,11 @@
 { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AppKit
+, CoreImage
 , ffmpeg-base ? callPackage ./base.nix { }
 , ffmpeg-avutil, ffmpeg
+, OpenGL
+, stdenv
+, VideoToolbox
 }:

 buildDunePackage {
@ -11,7 +16,8 @@ buildDunePackage {
  inherit (ffmpeg-base) version src useDune2;

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ]
+    ++ lib.optionals stdenv.isDarwin [ AppKit CoreImage OpenGL VideoToolbox ];
  propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix
@ -1,4 +1,5 @@
-{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+{ lib, stdenv, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
+, AudioToolbox, VideoToolbox
 , ffmpeg-base ? callPackage ./base.nix { }
 , ffmpeg
 }:
@ -11,7 +12,7 @@ buildDunePackage {
  inherit (ffmpeg-base) version src useDune2;

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ];
  propagatedBuildInputs = [ ffmpeg.dev ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix
@ -1,6 +1,8 @@
 { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
 , ffmpeg-base ? callPackage ./base.nix { }
 , ffmpeg-avutil, ffmpeg-avcodec, ffmpeg
+, stdenv
+, VideoToolbox
 }:

 buildDunePackage {
@ -11,7 +13,7 @@ buildDunePackage {
  inherit (ffmpeg-base) version src useDune2;

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ];
  propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix
@ -1,6 +1,8 @@
 { lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage
 , ffmpeg-base ? callPackage ./base.nix { }
 , ffmpeg-avutil, ffmpeg
+, stdenv
+, VideoToolbox
 }:

 buildDunePackage {
@ -11,7 +13,7 @@ buildDunePackage {
  inherit (ffmpeg-base) version src useDune2;

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ];
  propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ];

  doCheck = true;
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@ -6,8 +6,9 @@
 buildDunePackage rec {
  pname = "gapi-ocaml";
  version = "0.4.3";
+  duneVersion = "3";

-  minimalOCamlVersion = "4.02";
+  minimalOCamlVersion = "4.08";

  src = fetchFromGitHub {
    owner = "astrada";
@ -18,7 +19,7 @@ buildDunePackage rec {

  propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];

-  doCheck = lib.versionAtLeast ocaml.version "4.04";
+  doCheck = true;
  checkInputs = [ ounit2 ];

  meta = {
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@ -11,6 +11,7 @@ buildDunePackage rec {
  version = "3.10.1";

  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  src = fetchurl {
    url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
--- a/pkgs/development/ocaml-modules/graphql/cohttp.nix
+++ b/pkgs/development/ocaml-modules/graphql/cohttp.nix
@ -8,7 +8,7 @@ buildDunePackage rec {

  inherit (graphql) version src;

-  useDune2 = true;
+  duneVersion = "3";

  nativeBuildInputs = [ ocaml-crunch ];
  propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ];
--- a/pkgs/development/ocaml-modules/graphql/default.nix
+++ b/pkgs/development/ocaml-modules/graphql/default.nix
@ -5,6 +5,8 @@ buildDunePackage rec {

  inherit (graphql_parser) version src;

+  duneVersion = "3";
+
  propagatedBuildInputs = [ graphql_parser rresult yojson ];

  checkInputs = [ alcotest ];
--- a/pkgs/development/ocaml-modules/graphql/lwt.nix
+++ b/pkgs/development/ocaml-modules/graphql/lwt.nix
@ -5,6 +5,8 @@ buildDunePackage rec {

  inherit (graphql) version src;

+  duneVersion = "3";
+
  propagatedBuildInputs = [ graphql ocaml_lwt ];

  checkInputs = [ alcotest ];
--- a/pkgs/development/ocaml-modules/graphql/parser.nix
+++ b/pkgs/development/ocaml-modules/graphql/parser.nix
@ -5,6 +5,7 @@ buildDunePackage rec {
  version = "0.14.0";

  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  src = fetchurl {
    url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz";
--- a/pkgs/development/ocaml-modules/gstreamer/default.nix
+++ b/pkgs/development/ocaml-modules/gstreamer/default.nix
@ -1,4 +1,4 @@
-{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, glib, gst_all_1 }:
+{ lib, stdenv, buildDunePackage, fetchFromGitHub, dune-configurator, AppKit, Foundation, pkg-config, glib, gst_all_1 }:

 buildDunePackage rec {
  pname = "gstreamer";
@ -12,7 +12,7 @@ buildDunePackage rec {
  };

  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AppKit Foundation ];
  propagatedBuildInputs = [ glib.dev gst_all_1.gstreamer.dev gst_all_1.gst-plugins-base ];

  CFLAGS_COMPILE = [
--- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix
+++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix
@ -4,13 +4,13 @@

 buildDunePackage rec {
  pname = "happy-eyeballs";
-  version = "0.3.0";
+  version = "0.4.0";

  minimalOCamlVersion = "4.08";

  src = fetchurl {
    url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz";
-    sha256 = "17mnid1gvq1ml1zmqzn0m6jmrqw4kqdrjqrdsrphl5kxxyhs03m6";
+    hash = "sha256-gR9q4J/DnYJz8oYmk/wy17h4F6wxbllba/gkor5i1nQ=";
  };

  strictDeps = true;
--- a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix
+++ b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix
@ -17,6 +17,7 @@ buildDunePackage {
  inherit (happy-eyeballs) src version;

  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  strictDeps = true;

--- a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix
+++ b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix
@ -19,6 +19,7 @@ buildDunePackage {
  inherit (happy-eyeballs) src version;

  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  strictDeps = true;

--- a/pkgs/development/ocaml-modules/janestreet/0.14.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix
@ -120,6 +120,7 @@ with self;
  };

  async_smtp = janePackage {
+    duneVersion = "3";
    pname = "async_smtp";
    hash = "1xf3illn7vikdxldpnc29n4z8sv9f0wsdgdvl4iv93qlvjk8gzck";
    meta.description = "SMTP client and server";
@ -272,6 +273,7 @@ with self;
  };

  email_message = janePackage {
+    duneVersion = "3";
    pname = "email_message";
    hash = "0k8hjkq91ikl7wjxs04k523jbkhl6q4abj6v0lzlbjiybmrpp69n";
    meta.description = "E-mail message parser";
--- a/pkgs/development/ocaml-modules/janestreet/0.15.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix
@ -110,6 +110,7 @@ with self;
  };

  async_rpc_websocket = janePackage {
+    duneVersion = "3";
    pname = "async_rpc_websocket";
    hash = "1n93jhkz5r76xcc40c4i4sxcyfz1dbppz8sjfxpwcwjyi6lyhp1p";
    meta.description = "Library to serve and dispatch Async RPCs over websockets";
@ -131,6 +132,7 @@ with self;
  };

  async_smtp = janePackage {
+    duneVersion = "3";
    pname = "async_smtp";
    hash = "1m00j7wcb0blipnc1m6by70gd96a1k621b4dgvgffp8as04a461r";
    minimumOCamlVersion = "4.12";
@ -159,6 +161,7 @@ with self;
  };

  async_websocket = janePackage {
+    duneVersion = "3";
    pname = "async_websocket";
    hash = "16ixqfnx9jp77bvx11dlzsq0pzfpyiif60hl2q06zncyswky9xgb";
    meta.description = "A library that implements the websocket protocol on top of Async";
@ -243,6 +246,7 @@ with self;
  };

  cohttp_async_websocket = janePackage {
+    duneVersion = "3";
    pname = "cohttp_async_websocket";
    hash = "0d0smavnxpnwrmhlcf3b5a3cm3n9kz1y8fh6l28xv6zrn4sc7ik8";
    meta.description = "Websocket library for use with cohttp and async";
@ -317,6 +321,7 @@ with self;
  };

  email_message = janePackage {
+    duneVersion = "3";
    pname = "email_message";
    hash = "00h66l2g5rjaay0hbyqy4v9i866g779miriwv20h9k4mliqdq7in";
    meta.description = "E-mail message parser";
--- a/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/pkgs/development/ocaml-modules/labltk/default.nix
@ -1,4 +1,4 @@
-{ stdenv, lib, makeWrapper, fetchzip, ocaml, findlib, tcl, tk }:
+{ stdenv, lib, makeWrapper, fetchzip, Cocoa, ocaml, findlib, tcl, tk }:

 let
 params =
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
  pname = "ocaml${ocaml.version}-labltk";

  nativeBuildInputs = [ ocaml findlib makeWrapper ];
-  buildInputs = [ tcl tk ];
+  buildInputs = [ tcl tk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];

  configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ];
  dontAddPrefix = true;
--- a/pkgs/development/ocaml-modules/letsencrypt/app.nix
+++ b/pkgs/development/ocaml-modules/letsencrypt/app.nix
@ -17,12 +17,12 @@

 buildDunePackage {
  pname = "letsencrypt-app";
+  duneVersion = "3";
+  minimalOCamlVersion = "4.08";

  inherit (letsencrypt)
    src
    version
-    useDune2
-    minimumOCamlVersion
    ;

  buildInputs = [
--- a/pkgs/development/ocaml-modules/letsencrypt/default.nix
+++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix
@ -25,11 +25,11 @@ buildDunePackage rec {

  src = fetchurl {
    url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz";
-    sha256 = "f90875f5c9bdcab4c8be5ec7ebe9ea763030fa708e02857300996bb16e7c2070";
+    hash = "sha256-+Qh19cm9yrTIvl7H6+nqdjAw+nCOAoVzAJlrsW58IHA=";
  };

-  minimumOCamlVersion = "4.08";
-  useDune2 = true;
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  buildInputs = [
    fmt
--- a/pkgs/development/ocaml-modules/letsencrypt/dns.nix
+++ b/pkgs/development/ocaml-modules/letsencrypt/dns.nix
@ -11,12 +11,12 @@

 buildDunePackage {
  pname = "letsencrypt-dns";
+  duneVersion = "3";
+  minimalOCamlVersion = "4.08";

  inherit (letsencrypt)
    version
    src
-    useDune2
-    minimumOCamlVersion
    ;

  propagatedBuildInputs = [
--- a/pkgs/development/ocaml-modules/mimic/default.nix
+++ b/pkgs/development/ocaml-modules/mimic/default.nix
@ -8,6 +8,7 @@ buildDunePackage rec {
  version = "0.0.6";

  minimalOCamlVersion = "4.08";
+  duneVersion = "3";

  src = fetchurl {
    url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz";
--- a/Show More
+++ b/Show More