Merge master into staging-next

nixos/modules/services/web-apps/akkoma.nix

@@ -675,9 +675,9 @@ in
       };
 
       extraStatic = mkOption {
-        type = with types; nullOr (attrsOf package);
+        type = with types; nullOr (attrsOf pathInStore);
         description = ''
-          Attribute set of extra packages to add to the static files directory.
+          Attribute set of extra paths to add to the static files directory.
 
           Do not add frontends here. These should be configured through
           [{option}`services.akkoma.frontends`](#opt-services.akkoma.frontends).

nixos/modules/services/web-apps/onlyoffice.nix

@@ -99,6 +99,8 @@ in
       default = "amqp://guest:guest@localhost:5672";
       description = "The Rabbitmq in amqp URI style OnlyOffice should connect to.";
     };
+
+    wopi = lib.mkEnableOption "Enable WOPI support";
   };
 
   config = lib.mkIf cfg.enable {
@@ -316,7 +318,8 @@ in
               .services.CoAuthoring.secret.outbox.string = "'"$(cat ${cfg.jwtSecretFile})"'" |
               .services.CoAuthoring.secret.session.string = "'"$(cat ${cfg.jwtSecretFile})"'" |
             ''}
-              .rabbitmq.url = "${cfg.rabbitmqUrl}"
+              .rabbitmq.url = "${cfg.rabbitmqUrl}" |
+              .wopi.enable = "${toString cfg.wopi}"
               ' /run/onlyoffice/config/default.json | sponge /run/onlyoffice/config/default.json
 
             chmod u+w /run/onlyoffice/config/production-linux.json

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -1224,10 +1224,6 @@ assertNoAdditions {
     dependencies = [ self.plenary-nvim ];
   };
 
-  follow-md-links-nvim = super.follow-md-links-nvim.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
-  };
-
   forms = super.forms.overrideAttrs {
     dependencies = [ self.self ];
   };
@@ -1426,7 +1422,7 @@ assertNoAdditions {
   };
 
   haskell-scope-highlighting-nvim = super.haskell-scope-highlighting-nvim.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
+    dependencies = [ self.nvim-treesitter-parsers.haskell ];
   };
 
   haskell-snippets-nvim = super.haskell-snippets-nvim.overrideAttrs {
@@ -1474,7 +1470,6 @@ assertNoAdditions {
   hurl-nvim = super.hurl-nvim.overrideAttrs {
     dependencies = with self; [
       nui-nvim
-      nvim-treesitter
       nvim-treesitter-parsers.hurl
       plenary-nvim
     ];
@@ -1505,9 +1500,13 @@ assertNoAdditions {
   };
 
   indent-tools-nvim = super.indent-tools-nvim.overrideAttrs {
+    checkInputs = [
+      # nvim-treesitter-textobjects dep
+      self.nvim-treesitter
+    ];
     dependencies = with self; [
       arshlib-nvim
-      nvim-treesitter
+      # Optional dep for repeatable jumps
       nvim-treesitter-textobjects
     ];
   };
@@ -1857,11 +1856,9 @@ assertNoAdditions {
 
   markdoc-nvim = super.markdoc-nvim.overrideAttrs {
     dependencies = with self; [
-      (nvim-treesitter.withPlugins (p: [
-        p.markdown
-        p.markdown_inline
-        p.html
-      ]))
+      nvim-treesitter-parsers.markdown
+      nvim-treesitter-parsers.markdown_inline
+      nvim-treesitter-parsers.html
     ];
   };
 
@@ -2002,7 +1999,6 @@ assertNoAdditions {
 
   multicursors-nvim = super.multicursors-nvim.overrideAttrs {
     dependencies = with self; [
-      nvim-treesitter
       hydra-nvim
     ];
   };
@@ -2212,7 +2208,6 @@ assertNoAdditions {
     dependencies = with self; [
       neotest
       nvim-nio
-      nvim-treesitter
       plenary-nvim
     ];
   };
@@ -2635,15 +2630,11 @@ assertNoAdditions {
 
   nvim-nu = super.nvim-nu.overrideAttrs {
     dependencies = with self; [
-      nvim-treesitter
       none-ls-nvim
+      nvim-treesitter-parsers.nu
     ];
   };
 
-  nvim-paredit = super.nvim-paredit.overrideAttrs {
-    dependencies = with self; [ nvim-treesitter ];
-  };
-
   nvim-rip-substitute = super.nvim-rip-substitute.overrideAttrs {
     buildInputs = [ ripgrep ];
   };
@@ -2662,13 +2653,6 @@ assertNoAdditions {
     ];
   };
 
-  nvim-surround = super.nvim-surround.overrideAttrs {
-    checkInputs = [
-      # Optional treesitter integration
-      self.nvim-treesitter
-    ];
-  };
-
   nvim-teal-maker = super.nvim-teal-maker.overrideAttrs {
     postPatch = ''
       substituteInPlace lua/tealmaker/init.lua \
@@ -2753,10 +2737,6 @@ assertNoAdditions {
     dependencies = [ self.nvim-treesitter ];
   };
 
-  nvim-trevJ-lua = super.nvim-trevJ-lua.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
-  };
-
   nvim-ufo = super.nvim-ufo.overrideAttrs {
     dependencies = [ self.promise-async ];
   };
@@ -2957,7 +2937,6 @@ assertNoAdditions {
     dependencies = with self; [
       nvim-parinfer
       nvim-paredit
-      nvim-treesitter
     ];
   };
 
@@ -3089,7 +3068,6 @@ assertNoAdditions {
 
   refactoring-nvim = super.refactoring-nvim.overrideAttrs {
     dependencies = with self; [
-      nvim-treesitter
       plenary-nvim
     ];
   };
@@ -3612,20 +3590,16 @@ assertNoAdditions {
   };
 
   tsc-nvim = super.tsc-nvim.overrideAttrs {
-    patches = [ ./patches/tsc.nvim/fix-path.patch ];
-
     postPatch = ''
-      substituteInPlace lua/tsc/utils.lua --replace-fail '@tsc@' ${typescript}/bin/tsc
+      substituteInPlace lua/tsc/utils.lua --replace-fail \
+      'bin_name = bin_name or "tsc"' \
+      'bin_name = bin_name or "${typescript}/bin/tsc"'
     '';
 
     # Unit test
     nvimSkipModules = "tsc.better-messages-test";
   };
 
-  tssorter-nvim = super.tssorter-nvim.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
-  };
-
   tv-nvim = super.tv-nvim.overrideAttrs {
     runtimeDeps = [ television ];
   };
@@ -3966,11 +3940,6 @@ assertNoAdditions {
     buildInputs = [ vim ];
   };
 
-  vim-illuminate = super.vim-illuminate.overrideAttrs {
-    # Optional treesitter integration
-    checkInputs = [ self.nvim-treesitter ];
-  };
-
   vim-isort = super.vim-isort.overrideAttrs {
     postPatch = ''
       substituteInPlace autoload/vimisort.vim \

pkgs/applications/editors/vim/plugins/patches/tsc.nvim/fix-path.patch

@@ -1,13 +0,0 @@
-diff --git a/lua/tsc/utils.lua b/lua/tsc/utils.lua
-index 6433bcb..75760f9 100644
---- a/lua/tsc/utils.lua
-+++ b/lua/tsc/utils.lua
-@@ -16,7 +16,7 @@ M.find_tsc_bin = function()
-     return node_modules_tsc_binary
-   end
- 
--  return "tsc"
-+  return "@tsc@"
- end
- 
- --- @param run_mono_repo boolean

pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix

@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.73";
-    hash = "sha256-JmhdWX0ukTjb45dydLmKF1UAX1RMc89izgvuMtmdiUI=";
+    version = "2.0.74";
+    hash = "sha256-2GhutC0n56fd3+GwLJQFYKuhUOiYWW6S5M3GlsYOEMM=";
   };
 
   meta = {

pkgs/applications/video/jellyfin-desktop/default.nix

@@ -4,40 +4,48 @@
   stdenv,
   cmake,
   ninja,
+  python3,
   wrapQtAppsHook,
   qtbase,
   qtdeclarative,
   qtwebchannel,
   qtwebengine,
+  mpv-unwrapped,
   mpvqt,
   libcec,
   SDL2,
   libXrandr,
+  cacert,
+  nix-update-script,
 }:
 stdenv.mkDerivation rec {
-  pname = "jellyfin-media-player";
+  pname = "jellyfin-desktop";
   version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
-    repo = "jellyfin-media-player";
+    repo = "jellyfin-desktop";
     rev = "v${version}";
-    hash = "sha256-tdjmOeuC3LFEIDSH8X9LG/myvE1FoxwR1zpDQRyaTkQ=";
+    hash = "sha256-ITlYOrMS6COx9kDRSBi4wM6mzL/Q2G5X9GbABwDIOe4=";
+    fetchSubmodules = true;
   };
+  patches = [
+    ./non-fatal-unique-app.patch
+  ];
 
   nativeBuildInputs = [
     cmake
     ninja
     wrapQtAppsHook
-  ];
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin python3;
 
   buildInputs = [
     qtbase
     qtdeclarative
     qtwebchannel
     qtwebengine
-
-    mpvqt
+    mpv-unwrapped
 
     # input sources
     libcec
@@ -45,23 +53,33 @@ stdenv.mkDerivation rec {
 
     # frame rate switching
     libXrandr
-  ];
+    cacert
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) mpvqt;
 
   cmakeFlags = [
     "-DCHECK_FOR_UPDATES=OFF"
-    "-DUSE_STATIC_MPVQT=OFF"
     # workaround for Qt cmake weirdness
     "-DQT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES=ON"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "-DUSE_STATIC_MPVQT=ON"
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-DUSE_STATIC_MPVQT=OFF";
+
+  qtWrapperArgs = [
+    "--set QT_STYLE_OVERRIDE Fusion"
+    "--set NIX_SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt"
   ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/bin $out/Applications
-    mv "$out/Jellyfin Media Player.app" $out/Applications
-    ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer
+    mv "$out/Jellyfin Desktop.app" $out/Applications
+    ln -s "$out/Applications/Jellyfin Desktop.app/Contents/MacOS/Jellyfin Desktop" $out/bin/jellyfindesktop
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
-    homepage = "https://github.com/jellyfin/jellyfin-media-player";
+    homepage = "https://github.com/jellyfin/jellyfin-desktop";
     description = "Jellyfin Desktop Client";
     license = with lib.licenses; [
       gpl2Only
@@ -78,6 +96,6 @@ stdenv.mkDerivation rec {
       kranzes
       paumr
     ];
-    mainProgram = "jellyfinmediaplayer";
+    mainProgram = "jellyfin-desktop";
   };
 }

pkgs/applications/video/jellyfin-desktop/non-fatal-unique-app.patch

@@ -0,0 +1,19 @@
+--- a/src/shared/UniqueApplication.h
++++ b/src/shared/UniqueApplication.h
+@@ -6,6 +6,7 @@
+ #define KONVERGO_UNIQUEAPPLICATION_H
+ 
+ #include <QObject>
++#include <QDebug>
+ #include "Paths.h"
+ #include "LocalJsonServer.h"
+ #include "LocalJsonClient.h"
+@@ -35,7 +36,7 @@
+     });
+ 
+     if (!m_server->listen())
+-      throw FatalException("Failed to listen to uniqueApp socket: " + m_server->errorString());
++      qWarning() << "Failed to listen to uniqueApp socket: " << m_server->errorString();
+   }
+ 
+   bool ensureUnique()

pkgs/by-name/be/beluga/package.nix

@@ -15,8 +15,6 @@ ocamlPackages.buildDunePackage rec {
     hash = "sha256-bMaLjHq/3ZrST5E9lBSIX0T2cAhDin+lv1XwgUF4/7w=";
   };
 
-  duneVersion = "3";
-
   buildInputs = with ocamlPackages; [
     gen
     sedlex
@@ -26,7 +24,7 @@ ocamlPackages.buildDunePackage rec {
     omd
     uri
     ounit2
-    yojson
+    yojson_2
   ];
 
   doCheck = true;

pkgs/by-name/bl/blobtools/package.nix

@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+}:
+stdenv.mkDerivation {
+  pname = "blobtools";
+  version = "0-unstable-2012-10-24";
+
+  src = fetchFromGitHub {
+    owner = "AndroidRoot";
+    repo = "BlobTools";
+    rev = "6186e33baa10ce6f1c738d7b91eb5153743105af";
+    hash = "sha256-zg0A5Dm3255jqcioK45P2uzDnaaSAUkl4WtCJh77IuQ=";
+  };
+
+  strictDeps = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm555 {blobpack,blobunpack} -t $out/bin
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://github.com/AndroidRoot/BlobTools";
+    description = "Tools for modifiying ASUS Transformer firmware";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ungeskriptet ];
+    mainProgram = "blobpack";
+  };
+}

pkgs/by-name/ca/cargo-public-api/package.nix

@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-public-api";
-  version = "0.50.1";
+  version = "0.50.2";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-npSZT8ivdG1e+8mcRKlFHgjjwgLPOOGRqLHsPcu4vu0=";
+    hash = "sha256-Lg8X0t5u4Mq/eWc0yfuLyn4HlE+j6qSsLE+MFBjBpbk=";
   };
 
-  cargoHash = "sha256-VHZsUWyUEGMVOJkAuIRGVmej4KdAtAiTjagAvv+k/Os=";
+  cargoHash = "sha256-OjuCABObMRkFrTbtV4wpSHzV9Yqmwr/VotmsUW9qUDk=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/cl/claude-code/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.72",
+  "version": "2.0.73",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.72",
+      "version": "2.0.73",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"

pkgs/by-name/cl/claude-code/package.nix

@@ -11,14 +11,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.72";
+  version = "2.0.73";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-xa9etUBw1UIoHc44ypQ83PQKVNC0KS/DGwnZrvW9ero=";
+    hash = "sha256-kQRj8Vd735KyPzPZnoieE4TxUKHoCpnC62Blsh5dbWw=";
   };
 
-  npmDepsHash = "sha256-fUxOINLRXoXYyQzxmo2vtolzMr7mBIAct9hwNOAhNdg=";
+  npmDepsHash = "sha256-H6EqVQ7DpccxDzlMu9GuRIAQao8m3AO36mQUh1J0TRI=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

pkgs/by-name/co/colord/package.nix

@@ -122,11 +122,13 @@ stdenv.mkDerivation rec {
     glib-compile-schemas $out/share/glib-2.0/schemas
   '';
 
-  PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
-  PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
-  PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d";
-  PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions";
-  PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
+  env = {
+    PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
+    PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
+    PKG_CONFIG_SYSTEMD_TMPFILESDIR = "${placeholder "out"}/lib/tmpfiles.d";
+    PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions";
+    PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
+  };
 
   passthru = {
     tests = {

pkgs/by-name/co/cosmic-ext-applet-minimon/package.nix

@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-ext-applet-minimon";
-  version = "0.9.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "cosmic-utils";
     repo = "minimon-applet";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tUAp6GN5oJYhALjTpEELMOEBpfao5D9B0hl2ecNtwMg=";
+    hash = "sha256-Vxbzg7LHD+gYOeS+KHbV1zo17O0BsDLgQayYS0yBIOM=";
   };
 
-  cargoHash = "sha256-qgqlEufv9vLLIOcDLiX76xRcXal1Q0S5726ua+8R8Ek=";
+  cargoHash = "sha256-VmpzzEe6rE2LbaH1wZH37FoLJ93y4VIK8KiVDzT/Wj8=";
 
   nativeBuildInputs = [
     just

pkgs/by-name/dr/draupnir/package.nix

@@ -22,13 +22,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "draupnir";
-  version = "2.8.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "the-draupnir-project";
     repo = "Draupnir";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I9DYiNxD95pzHVsgZ/hJwHfrsVqE/eBALNiePVNDpy0=";
+    hash = "sha256-j5UEW9JpIHhFWGMEwrPE1v0hdFAw5Z4CImRYEm56I4k=";
   };
 
   nativeBuildInputs = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = fetchYarnDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-kTdJ6zKNjH5CxcM9EvXzbz2Phrp5xI0+pvNwMLRmLgQ=";
+    hash = "sha256-Ck6Ba/qDlEW5jqKUX8tyB0QbiVXU8+ND2tvhftmYktY=";
   };
 
   preBuild = ''

pkgs/by-name/fa/fastmail-desktop/package.nix

@@ -22,7 +22,6 @@ callPackage (if isDarwin then ./darwin.nix else ./linux.nix) {
     license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = [
-      lib.maintainers.Enzime
       lib.maintainers.nekowinston
     ];
     platforms = [

pkgs/by-name/fa/faustlsp/package.nix

@@ -0,0 +1,32 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "faustlsp";
+  version = "0-unstable-2025-10-29";
+
+  src = fetchFromGitHub {
+    owner = "grame-cncm";
+    repo = "faustlsp";
+    rev = "017e28bbf03cf632118a0a7e0d5dbe0c6a6ea52e";
+    hash = "sha256-cidOJYQf58+zS9HlTJkzUy7zStHuX8bVhf4EkG9qR5k=";
+  };
+
+  vendorHash = "sha256-9qARh53TboBuTYp6kGxR53yjDkix0CKIt1VPYBmg0dY=";
+
+  proxyVendor = true;
+
+  doCheck = false;
+
+  meta = {
+    description = "Language Server Protocol (LSP) implementation for the Faust programming language";
+    homepage = "https://github.com/grame-cncm/faustlsp";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    mainProgram = "faustlsp";
+    platforms = lib.platforms.all;
+  };
+})

pkgs/by-name/fo/forgejo-runner/package.nix

@@ -6,6 +6,8 @@
   nixosTests,
   versionCheckHook,
   nix-update-script,
+  gitMinimal,
+  makeWrapper,
 }:
 
 let
@@ -17,7 +19,7 @@ let
     # The following tests were introduced in 9.x with the inclusion of act
     # the pkgs/by-name/ac/act/package.nix just sets doCheck = false;
 
-    # Requires running docker install
+    # Requires running Docker daemon
     "TestDocker"
     "TestJobExecutor"
     "TestRunner"
@@ -29,7 +31,7 @@ let
     # Reaches out to different websites
     "TestFindGitRemoteURL"
     "TestGitFindRef"
-    "TestGitCloneExecutor"
+    "TestClone"
     "TestCloneIfRequired"
     "TestActionCache"
     "TestRunContext_GetGitHubContext"
@@ -46,17 +48,19 @@ let
 in
 buildGoModule rec {
   pname = "forgejo-runner";
-  version = "11.3.1";
+  version = "12.2.0";
 
   src = fetchFromGitea {
     domain = "code.forgejo.org";
     owner = "forgejo";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-jvHnTCkRvYaejeCiPpr18ldEmxcAkrEIaOLVVBY11eg=";
+    hash = "sha256-UzBRIa+mhynJDYHzssApMPyLeHdFVSAZ6SZtPbtJpB4=";
   };
 
-  vendorHash = "sha256-7Ybh5qzkqT3CvGtRXiPkc5ShTYGlyvckTxg4EFagM/c=";
+  vendorHash = "sha256-ReGxoPvW4G6DbFfR2OeeT3tupZkpLpX80zK824oeyVg=";
+
+  nativeBuildInputs = [ makeWrapper ];
 
   # See upstream Makefile
   # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile
@@ -68,7 +72,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X code.forgejo.org/forgejo/runner/v11/internal/pkg/ver.version=${src.rev}"
+    "-X code.forgejo.org/forgejo/runner/v12/internal/pkg/ver.version=${src.rev}"
   ];
 
   checkFlags = [
@@ -76,13 +80,19 @@ buildGoModule rec {
   ];
 
   postInstall = ''
-    # fix up go-specific executable naming derived from package name, upstream
+    # Fix up go-specific executable naming derived from package name, upstream
     # also calls it `forgejo-runner`
     mv $out/bin/runner $out/bin/forgejo-runner
-    # provide old binary name for compatibility
+
+    # Provide backward compatbility since v12 removed bundled git
+    wrapProgram $out/bin/forgejo-runner --suffix PATH : ${lib.makeBinPath [ gitMinimal ]}
+
+    # Provide old binary name for compatibility
     ln -s $out/bin/forgejo-runner $out/bin/act_runner
   '';
 
+  nativeCheckInputs = [ gitMinimal ];
+
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}";

pkgs/by-name/fw/fwupd/package.nix

@@ -135,7 +135,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fwupd";
-  version = "2.0.18";
+  version = "2.0.19";
 
   # libfwupd goes to lib
   # daemon, plug-ins and libfwupdplugin go to out
@@ -153,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fwupd";
     repo = "fwupd";
     tag = finalAttrs.version;
-    hash = "sha256-hF0fSn8lh0E0UQ+7HgMvqjltFajjx11s7THZYpt/hlE=";
+    hash = "sha256-DjO+7CEOef5KMbYEPtDr3GrnXTDUO/jwwZ4P17o4oDg=";
   };
 
   patches = [

pkgs/by-name/ga/gatus/package.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gatus";
-  version = "5.31.0";
+  version = "5.33.1";
 
   src = fetchFromGitHub {
     owner = "TwiN";
     repo = "gatus";
     rev = "v${version}";
-    hash = "sha256-thLS6pAlnu7XcQHritr28CnzmpIOgIcEPIch2IwhZfQ=";
+    hash = "sha256-m7dOgxk1EuyqIuVK4ZDimqZX015Osk5FF+0/SFAkp90=";
   };
 
-  vendorHash = "sha256-VaD/cTf9D00gr6+9gKadK4aTwqhmJN/+cohwNvckxyw=";
+  vendorHash = "sha256-T4BPCDYR/f2rInLNytaVibE2hKWsIYqpJw9asY0TbvY=";
 
   subPackages = [ "." ];
 

pkgs/by-name/is/ispc/package.nix

@@ -54,14 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionalString stdenv.hostPlatform.isDarwin ''
       substituteInPlace src/util.cpp \
         --replace-fail "#ifdef _LIBCPP_VERSION" "#if FALSE"
-    ''
-    # These tests fail on x86_64-darwin, see ispc/ispc#{3529, 3623}
-    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
-      substituteInPlace tests/func-tests/round-float16-uniform.ispc \
-        --replace-fail "// See issue #3529" "// rule: skip on OS=mac"
-
-      substituteInPlace tests/func-tests/round-float16-varying.ispc \
-        --replace-fail "// See issue #3529" "// rule: skip on OS=mac"
     '';
 
   inherit testedTargets;

pkgs/by-name/ja/jan/package.nix

@@ -2,33 +2,91 @@
   lib,
   appimageTools,
   fetchurl,
+  config,
+  cudaPackages,
+  cudaSupport ? config.cudaSupport,
+  stdenv,
+  fetchzip,
+  makeWrapper,
 }:
 
 let
   pname = "Jan";
-  version = "0.6.10";
-  src = fetchurl {
-    url = "https://github.com/menloresearch/jan/releases/download/v${version}/jan_${version}_amd64.AppImage";
-    hash = "sha256-eag8c/Jp2ahV71kEuFoT2rmz0S9RPbiqy5YBO0Z+ICY=";
+  version = "0.7.5";
+
+  darwin-src = fetchzip {
+    url = "https://github.com/janhq/jan/releases/download/v${version}/jan-mac-universal-${version}.zip";
+    hash = "sha256-stTsLKE+2gUKAVwJ2/gOckoL6Nygwr0rkugD1jGj1w4=";
   };
 
-  appimageContents = appimageTools.extractType2 { inherit pname version src; };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
+  linux-src = fetchurl {
+    url = "https://github.com/janhq/jan/releases/download/v${version}/jan_${version}_amd64.AppImage";
+    hash = "sha256-RIEBpeogNIDPMpoY5Gk8q4+t7jxcWJEZLPqJHWyaVk4=";
+  };
 
-  extraInstallCommands = ''
-    install -Dm444 ${appimageContents}/Jan.desktop -t $out/share/applications
-    cp -r ${appimageContents}/usr/share/icons $out/share
-  '';
+  appimageContents = appimageTools.extractType2 {
+    inherit pname version;
+    src = linux-src;
+  };
 
   meta = {
-    changelog = "https://github.com/menloresearch/jan/releases/tag/v${version}";
+    changelog = "https://github.com/janhq/jan/releases/tag/v${version}";
     description = "Jan is an open source alternative to ChatGPT that runs 100% offline on your computer";
-    homepage = "https://github.com/menloresearch/jan";
-    license = lib.licenses.agpl3Plus;
+    homepage = "https://github.com/janhq/jan";
+    license = lib.licenses.asl20;
     mainProgram = "Jan";
     maintainers = [ ];
-    platforms = with lib.systems.inspect; patternLogicalAnd patterns.isLinux patterns.isx86_64;
+    platforms =
+      lib.platforms.darwin
+      ++ (with lib.systems.inspect; patternLogicalAnd patterns.isLinux patterns.isx86_64);
   };
-}
+
+  linux = appimageTools.wrapType2 {
+    inherit pname version;
+    src = linux-src;
+
+    extraInstallCommands = ''
+      install -Dm444 ${appimageContents}/Jan.desktop -t $out/share/applications
+      cp -r ${appimageContents}/usr/share/icons $out/share
+    '';
+
+    extraPkgs =
+      pkgs:
+      lib.optionals cudaSupport [
+        cudaPackages.cudatoolkit
+      ];
+
+    inherit meta;
+  };
+
+  darwin = stdenv.mkDerivation {
+    inherit
+      pname
+      version
+      meta
+      ;
+
+    src = darwin-src;
+
+    dontUnpack = true;
+
+    sourceRoot = "${pname}.app";
+    nativeBuildInputs = [
+      makeWrapper
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/Applications/${pname}.app
+      mkdir -p $out/bin
+      cp -R $src/. $out/Applications/${pname}.app/
+      if [ -x "$out/Applications/${pname}.app/Contents/MacOS/${pname}" ]; then
+        makeWrapper "$out/Applications/${pname}.app/Contents/MacOS/${pname}" $out/bin/${pname}
+      fi
+
+      runHook postInstall
+    '';
+  };
+in
+if stdenv.hostPlatform.isDarwin then darwin else linux

pkgs/by-name/ka/katex/package.nix

@@ -10,18 +10,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "katex";
-  version = "0.16.25";
+  version = "0.16.27";
 
   src = fetchFromGitHub {
     owner = "katex";
     repo = "katex";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XwKjoXkn96YNxrBv2qcUSqKMtHxz9+levevc4Rz1SYw=";
+    hash = "sha256-bw5W8TkM31aeqQ6eJae8voW75RvvUjeTdu7aPQ+lAa0=";
   };
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-vPYzt+ZBbi1sR7T1I08f/syTnN8hnUTqH4fKCBiFIM0=";
+    hash = "sha256-bRzYuiYDAz9LTcaUgI0dvfxU/eo0uTSz0pPP7dH5XW8=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ko/korrect/package.nix

@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "korrect";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-iEbzYcWxDAumGLsr7MlqOrTEj3SwGFmdvw15M5Fz9cs=";
+    hash = "sha256-AOYwknKVtvw/gQ10gwHTNFQ2KvPuldRk8UxRcbkO6tE=";
   };
-  cargoHash = "sha256-RIa1rn74I/DQktjtY4BTWiYIBO1aLpXcKtXMBOAogvE=";
+  cargoHash = "sha256-2od1FlV7yx9bAV1eSvTVeJfm7FsGtFGTzsBPh6Of+SU=";
 
   # Tests create a local http server to check the download functionality
   __darwinAllowLocalNetworking = true;

pkgs/by-name/nf/nfs-ganesha/package.nix

@@ -16,6 +16,7 @@
   flex,
   nfs-utils,
   acl,
+  prometheus-cpp-lite,
   useCeph ? false,
   ceph,
   useDbus ? true,
@@ -24,7 +25,7 @@
 
 stdenv.mkDerivation rec {
   pname = "nfs-ganesha";
-  version = "6.5";
+  version = "9.2";
 
   outputs = [
     "out"
@@ -35,14 +36,16 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nfs-ganesha";
     repo = "nfs-ganesha";
-    rev = "V${version}";
-    hash = "sha256-OHGmEzHu8y/TPQ70E2sicaLtNgvlf/bRq8JRs6S1tpY=";
+    tag = "V${version}";
+    hash = "sha256-2EAkr+zu7Jc2j/8BrJ/+Skv/D3rTSbh4A5JTRhWafEk=";
   };
 
   patches = lib.optional useDbus ./allow-bypassing-dbus-pkg-config-test.patch;
 
   preConfigure = "cd src";
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-redundant-move";
+
   cmakeFlags = [
     "-DUSE_SYSTEM_NTIRPC=ON"
     "-DSYSSTATEDIR=/var"
@@ -50,6 +53,7 @@ stdenv.mkDerivation rec {
     "-DUSE_ACL_MAPPING=ON"
     "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON"
     "-DUSE_MAN_PAGE=ON"
+    "-DUSE_MONITORING=ON"
   ]
   ++ lib.optionals useCeph [
     "-DUSE_RADOS_RECOV=ON"
@@ -85,14 +89,11 @@ stdenv.mkDerivation rec {
     ntirpc
     liburcu
     nfs-utils
+    prometheus-cpp-lite
   ]
   ++ lib.optional useCeph ceph;
 
   postPatch = ''
-    substituteInPlace src/CMakeLists.txt --replace-fail \
-      "cmake_minimum_required(VERSION 2.6.3)" \
-      "cmake_minimum_required(VERSION 3.10)"
-
     substituteInPlace src/tools/mount.9P --replace-fail "/bin/mount" "/usr/bin/env mount"
   '';
 

pkgs/by-name/nt/ntirpc/package.nix

@@ -7,17 +7,18 @@
   liburcu,
   libtirpc,
   libnsl,
+  prometheus-cpp-lite,
 }:
 
 stdenv.mkDerivation rec {
   pname = "ntirpc";
-  version = "6.3";
+  version = "7.2";
 
   src = fetchFromGitHub {
     owner = "nfs-ganesha";
     repo = "ntirpc";
     rev = "v${version}";
-    sha256 = "sha256-e4eF09xwX2Qf/y9YfOGy7p6yhDFnKGI5cnrQy3o8c98=";
+    hash = "sha256-4E6wDAwinCNn7arRgBulg7e0x9S/steh+mjwNY4X3Vc=";
   };
 
   outputs = [
@@ -38,6 +39,11 @@ stdenv.mkDerivation rec {
     krb5
     liburcu
     libnsl
+    prometheus-cpp-lite
+  ];
+
+  cmakeFlags = [
+    "-DUSE_MONITORING=ON"
   ];
 
   postInstall = ''

pkgs/by-name/pa/parca-agent/package.nix

@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "parca-agent";
-  version = "0.44.1";
+  version = "0.44.2";
 
   src = fetchFromGitHub {
     owner = "parca-dev";
     repo = "parca-agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CMX6Cl46pHRdVOv/EmMfqN5sdLmRUbU3gR6iwqkx1bg=";
+    hash = "sha256-nRStraxWDk3eY6L4znPsvT+NNz/cIYBae5sdYnOybi0=";
     fetchSubmodules = true;
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-VvO2sDgr+MlKcHDQzcZPpxyIBO/NrkdfF8ntA/SCb2Y=";
+  vendorHash = "sha256-OvhKmCxLIzLXxBmTaLrZFTAIkZXG2C1AZggaVYhlF3I=";
 
   buildInputs = [
     stdenv.cc.libc.static

pkgs/by-name/pr/pretix/package.nix

@@ -42,13 +42,13 @@ let
   };
 
   pname = "pretix";
-  version = "2025.10.0";
+  version = "2025.10.1";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     rev = "refs/tags/v${version}";
-    hash = "sha256-q8h7wYUv5ahWvM3sT9srVHnJv5QnakkUKYhgx1X/j5k=";
+    hash = "sha256-O9HAslZ8xbmLgJi3y91M6mc1oIvJZ8nRJyFRuNorRHs=";
   };
 
   npmDeps = buildNpmPackage {

pkgs/by-name/pr/prometheus-cpp-lite/missing_includes.patch

@@ -0,0 +1,11 @@
+diff --git a/core/include/prometheus/family.h b/core/include/prometheus/family.h
+index 1c625c1..a3d0e85 100644
+--- a/core/include/prometheus/family.h
++++ b/core/include/prometheus/family.h
+@@ -1,5 +1,6 @@
+ #pragma once
+ 
++#include <stdexcept>
+ #include <cstddef>
+ #include <map>
+ #include <memory>

pkgs/by-name/pr/prometheus-cpp-lite/package.nix

@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "prometheus-cpp-lite";
+  version = "1.0-unstable-2023-08-13";
+
+  src = fetchFromGitHub {
+    owner = "biaks";
+    repo = "prometheus-cpp-lite";
+    rev = "48d09c45ee6deb90e02579b03037740e1c01fd27";
+    hash = "sha256-XplbP4wHxK9z8Q5fOnaiL7vzXBaZTJyo/tmXUJN/mb4=";
+  };
+
+  patches = [
+    ./missing_includes.patch
+  ];
+
+  postPatch = ''
+    for dir in . core simpleapi; do
+    substituteInPlace $dir/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.2)' \
+      'cmake_minimum_required(VERSION 3.10)'
+    done
+
+    substituteInPlace 3rdpatry/http-client-lite/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.3 FATAL_ERROR)' \
+      'cmake_minimum_required(VERSION 3.10)' \
+  '';
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/include/prometheus $out/lib
+
+    cp ../core/include/prometheus/* $out/include/prometheus
+    cp ../simpleapi/include/prometheus/* $out/include/prometheus
+    cp simpleapi/libprometheus-cpp-simpleapi.* $out/lib/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "C++ Header-only Prometheus client library";
+    homepage = "https://github.com/biaks/prometheus-cpp-lite";
+    maintainers = [ lib.maintainers.markuskowa ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+  };
+})

pkgs/by-name/ro/roslyn-ls/deps.json

@@ -127,9 +127,9 @@
   },
   {
     "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "11.0.0-beta.25578.1",
-    "hash": "sha256-c8IWX17rJM4aOxvPEbMUDzeLR6kEwWWTstm4waw3d80=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.25578.1/microsoft.dotnet.arcade.sdk.11.0.0-beta.25578.1.nupkg"
+    "version": "11.0.0-beta.25603.2",
+    "hash": "sha256-xXwq/ffFnDXjMnrzKUAT3Du31tKso7aNW4VBvABHX4M=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/11.0.0-beta.25603.2/microsoft.dotnet.arcade.sdk.11.0.0-beta.25603.2.nupkg"
   },
   {
     "pname": "Microsoft.DotNet.FileBasedPrograms",
@@ -139,9 +139,9 @@
   },
   {
     "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "11.0.0-beta.25578.1",
-    "hash": "sha256-EPo2bgR7oW/a8htIps64UrAPuoyyuIYYG54cZRoknUY=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.25578.1/microsoft.dotnet.xlifftasks.11.0.0-beta.25578.1.nupkg"
+    "version": "11.0.0-beta.25603.2",
+    "hash": "sha256-qLUHUextwX33sSm4oK0N4qpbGEZpz6qOw5kabpJ9Xkk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/11.0.0-beta.25603.2/microsoft.dotnet.xlifftasks.11.0.0-beta.25603.2.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.Configuration",

pkgs/by-name/ro/roslyn-ls/package.nix

@@ -6,16 +6,18 @@
   stdenvNoCC,
   testers,
   jq,
-  writeText,
   runCommand,
   expect,
 }:
 let
   pname = "roslyn-ls";
+  # see https://github.com/dotnet/roslyn/blob/main/eng/targets/TargetFrameworks.props
   dotnet-sdk =
     with dotnetCorePackages;
+    # required sdk
     sdk_10_0
     // {
+      # with additional packages to minimize deps.json
       inherit
         (combinePackages [
           sdk_9_0
@@ -25,45 +27,29 @@ let
         targetPackages
         ;
     };
-  # need sdk on runtime as well
-  dotnet-runtime = dotnetCorePackages.sdk_10_0;
+  # should match the default NetVSCode property
+  # see https://github.com/dotnet/roslyn/blob/main/eng/targets/TargetFrameworks.props
+  dotnet-runtime = dotnetCorePackages.sdk_10_0.runtime;
+
   rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system;
 
   project = "Microsoft.CodeAnalysis.LanguageServer";
-
-  targets = writeText "versions.targets" ''
-    <Project>
-      <ItemGroup>
-        <KnownFrameworkReference Update="@(KnownFrameworkReference)">
-          <LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'net8.0'">${dotnetCorePackages.sdk_8_0.runtime.version}</LatestRuntimeFrameworkVersion>
-          <LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == 'net9.0'">${dotnetCorePackages.sdk_9_0.runtime.version}</LatestRuntimeFrameworkVersion>
-          <TargetingPackVersion Condition="'%(TargetFramework)' == 'net8.0'">${dotnetCorePackages.sdk_8_0.runtime.version}</TargetingPackVersion>
-          <TargetingPackVersion Condition="'%(TargetFramework)' == 'net9.0'">${dotnetCorePackages.sdk_9_0.runtime.version}</TargetingPackVersion>
-        </KnownFrameworkReference>
-        <KnownAppHostPack Update="@(KnownAppHostPack)">
-          <AppHostPackVersion Condition="'%(TargetFramework)' == 'net8.0'">${dotnetCorePackages.sdk_8_0.runtime.version}</AppHostPackVersion>
-          <AppHostPackVersion Condition="'%(TargetFramework)' == 'net9.0'">${dotnetCorePackages.sdk_9_0.runtime.version}</AppHostPackVersion>
-        </KnownAppHostPack>
-      </ItemGroup>
-    </Project>
-  '';
-
 in
 buildDotnetModule (finalAttrs: rec {
   inherit pname dotnet-sdk dotnet-runtime;
 
-  vsVersion = "2.103.33-prerelease";
+  vsVersion = "2.111.2-prerelease";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
     rev = "VSCode-CSharp-${vsVersion}";
-    hash = "sha256-uz0V4vTwfmeY5qPv9K30eB0MZTCpPee3PgIdlrXL/qs=";
+    hash = "sha256-oP+mKOvsbc+/NnqJvounE75BlE6UJTIAnmYTBNQlMFA=";
   };
 
   # versioned independently from vscode-csharp
   # "roslyn" in here:
   # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "5.3.0-2.25603.1";
+  version = "5.3.0-2.25604.5";
   projectFile = "src/LanguageServer/${project}/${project}.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;
@@ -80,23 +66,34 @@ buildDotnetModule (finalAttrs: rec {
     # Upstream uses rollForward = latestPatch, which pins to an *exact* .NET SDK version.
     jq '.sdk.rollForward = "latestMinor"' < global.json > global.json.tmp
     mv global.json.tmp global.json
-
-    substituteInPlace Directory.Build.targets \
-      --replace-fail '</Project>' '<Import Project="${targets}" /></Project>'
   '';
 
+  # don't build binary
+  useAppHost = false;
   dotnetFlags = [
     "-p:TargetRid=${rid}"
+    # we don't want to build the binary
+    # and useAppHost is not enough, need to explicilty set to false
+    "-p:UseAppHost=false"
+    # avoid platform-specific crossgen packages
+    "-p:PublishReadyToRun=false"
     # this removes the Microsoft.WindowsDesktop.App.Ref dependency
     "-p:EnableWindowsTargeting=false"
-    # this is needed for the KnownAppHostPack changes to work
-    "-p:EnableAppHostPackDownload=true"
+    # avoid unnecessary packages in deps.json
+    "-p:EnableAppHostPackDownload=false"
+    "-p:EnableRuntimePackDownload=false"
   ];
 
-  # two problems solved here:
-  # 1. --no-build removed -> BuildHost project within roslyn is running Build target during publish
-  # 2. missing crossgen2 7.* in local nuget directory when PublishReadyToRun=true
-  # the latter should be fixable here but unsure how
+  executables = [ project ];
+
+  postInstall = ''
+    # fake executable that we substitute in postFixup
+    touch $out/lib/$pname/${project}
+    chmod +x $out/lib/$pname/${project}
+  '';
+
+  # problem and solution:
+  # BuildHost project within roslyn is running Build target during publish -> --no-build removed
   installPhase = ''
     runHook preInstall
 
@@ -104,9 +101,8 @@ buildDotnetModule (finalAttrs: rec {
         -p:ContinuousIntegrationBuild=true \
         -p:Deterministic=true \
         -p:InformationalVersion=$version \
-        -p:UseAppHost=true \
         -p:PublishTrimmed=false \
-        -p:PublishReadyToRun=false \
+        -p:OverwriteReadOnlyFiles=true \
         --configuration Release \
         --no-self-contained \
         --output "$out/lib/$pname" \
@@ -118,6 +114,14 @@ buildDotnetModule (finalAttrs: rec {
     runHook postInstall
   '';
 
+  # force dotnet-runtime to run the dll
+  # but keep the wrapper created with useDotnetFromEnv to allow LS to work properly on codebases
+  postFixup = ''
+    rm -f $out/lib/$pname/${project}
+    substituteInPlace $out/bin/${project} \
+      --replace-fail "$out/lib/$pname/${project}" "${lib.getExe dotnet-runtime}\" \"$out/lib/$pname/${project}.dll"
+  '';
+
   passthru = {
     tests =
       let
@@ -151,6 +155,7 @@ buildDotnetModule (finalAttrs: rec {
       in
       {
         # Make sure we can run with any supported SDK version, as well as without
+        with-net8-sdk = with-sdk dotnetCorePackages.sdk_8_0;
         with-net9-sdk = with-sdk dotnetCorePackages.sdk_9_0;
         with-net10-sdk = with-sdk dotnetCorePackages.sdk_10_0;
         no-sdk = with-sdk null;

pkgs/by-name/ru/rumdl/package.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rumdl";
-  version = "0.0.194";
+  version = "0.0.195";
 
   src = fetchFromGitHub {
     owner = "rvben";
     repo = "rumdl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4+JeAFS9ELfAq43fH/HYhjCZoNmlZ+fPf1RVJnWRRnQ=";
+    hash = "sha256-g0cbn+VhSqCiSLxVHMpWoTzBaM9zkK4Neo3Z91ts8ic=";
   };
 
-  cargoHash = "sha256-fUpwSFT/Sg+akzBLq07YFxqCaGwEH0b2LD3c/Eojwpw=";
+  cargoHash = "sha256-sK7HM0lTQFTCCS7dC/Q3+XyskepGBM3r3GORsA0zgsw=";
 
   cargoBuildFlags = [
     "--bin=rumdl"

pkgs/by-name/sa/satyrographos/package.nix

@@ -17,8 +17,6 @@ in
 ocamlPackages.buildDunePackage {
   inherit pname version src;
 
-  duneVersion = "3";
-
   nativeBuildInputs = with ocamlPackages; [
     menhir
   ];
@@ -29,14 +27,13 @@ ocamlPackages.buildDunePackage {
     opam-format
     opam-state
     ppx_deriving
-    ppx_deriving_yojson
+    (ppx_deriving_yojson.override { yojson = yojson_2; })
     ppx_import
     ppx_jane
     shexp
     uri
     uri-sexp
     yaml-sexp
-    yojson
   ];
 
   meta = {

pkgs/by-name/se/serie/package.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "serie";
-  version = "0.5.5";
+  version = "0.5.6";
 
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "serie";
     rev = "v${version}";
-    hash = "sha256-qbXbbHu8RFSzeexWY/KQKEDnL+pRQPSV8sweCEcv4Kc=";
+    hash = "sha256-i9muqWkvJOBuUmOJ2ib8S6WOKUwqmiciZFc+rv0GBpI=";
   };
 
-  cargoHash = "sha256-lNJY+iNXE+f1haOmNL6OehS5KsLYJMCvF04U5a/AXhA=";
+  cargoHash = "sha256-8ZTk6Kixiv4MCpvAdYfwiJzJIMqX5MVu9pNaPjMahUs=";
 
   nativeCheckInputs = [ gitMinimal ];
 

pkgs/by-name/tr/trezor-suite/package.nix

@@ -10,7 +10,7 @@
 
 let
   pname = "trezor-suite";
-  version = "25.11.3";
+  version = "25.12.2";
 
   suffix =
     {
@@ -24,8 +24,8 @@ let
     hash =
       {
         # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
-        aarch64-linux = "sha512-fY2X571p71HCtAFGcYxBwvrlb556hJSyBCNkyVJ6s+P3GuBlTqapSTuE/ZAyPraS9H/QMEVnZF+Qpzu/6hgiew==";
-        x86_64-linux = "sha512-00Nnc7xY3snP5gS5GzszgE3MVTNZ6jUiU43D68Pz4aYzgNaPn8JMuh3kC0ybxm4HaHnZ9EC4Eraa9U5gO8Mq3w==";
+        aarch64-linux = "sha512-AneflaNO3OXomrhwiCQC0bw1hvFVVWy9YQ63zmeAAU5YQYFRhdlvXXNCxQEFKXfy6079MvLM67+42FGGsVAf6w==";
+        x86_64-linux = "sha512-/kjqLGF7MY+2UGSE7DnS64o8U2HntzGrw3c5b5AGoXc8wx3emEBjPmTELnDxQpgMdl7L7uaV3O1Sj2ebfweRpQ==";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

pkgs/by-name/ve/vectorcode/package.nix

@@ -96,14 +96,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "vectorcode";
-  version = "0.7.19";
+  version = "0.7.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Davidyz";
     repo = "VectorCode";
     tag = version;
-    hash = "sha256-H2Umh4/vRDqaGXVoK/fZaj9guA4IaVSgOEDAVEPsD9A=";
+    hash = "sha256-RU9WnKuPaxDnPW5MQyrxPEw7ufMcVNxSRyJ5QvrzoVs=";
   };
 
   build-system = with python.pkgs; [

pkgs/by-name/ve/vega-cli/package.nix

@@ -0,0 +1,77 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  pkg-config,
+  pixman,
+  cairo,
+  pango,
+  jq,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "vega-cli";
+  version = "6.2.0";
+
+  src = fetchFromGitHub {
+    owner = "vega";
+    repo = "vega";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-YO3YzTRNJKDOgCxMXnw2P2d1ZN79Db3//L9iLjDGiyM=";
+  };
+
+  postPatch = ''
+    # We never need this, so just skip it to save some time while building.
+    patchShebangs scripts/postinstall.sh
+    substituteInPlace scripts/postinstall.sh \
+      --replace-fail "npm run data" "true"
+
+    # Patch lerna.json to not use nx
+    mv lerna.json lerna.old.json
+    jq '. + {useNx: false}' < lerna.old.json > lerna.json
+  '';
+
+  npmDepsHash = "sha256-mBe1fHnhor7ZR8CuRNs1zD7JzaZXZI5VM7mdAieVKqE=";
+
+  npmWorkspace = "vega-cli";
+
+  buildInputs = [
+    pixman
+    cairo
+    pango
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    jq
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    npm run build --scope vega-cli --include-dependencies --stream
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # prune non-prod deps
+    npm prune --omit=dev --no-save --workspace vega-cli
+
+    mkdir -p $out/lib/node_modules/vega-cli
+    rm -rf packages/**/{test,*.md,.npmignore}
+    cp -r ./packages ./node_modules $out/lib/node_modules/vega-cli
+    ln -s $out/lib/node_modules/vega-cli/packages/vega-cli/bin $out/bin
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Command line tools for the Vega visualization grammar";
+    homepage = "https://vega.github.io/vega/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})

pkgs/by-name/ve/versitygw/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "versitygw";
-  version = "1.0.19";
+  version = "1.0.20";
 
   src = fetchFromGitHub {
     owner = "versity";
     repo = "versitygw";
     tag = "v${version}";
-    hash = "sha256-Cz8hxw+10Cg112Qu+9/FTDWVaf2COBzVJDxZkt8c4Yg=";
+    hash = "sha256-uRYGcV1vXZS7tCuj4riBU4ROQQkYbTFSYYNJa0Dy1mA=";
   };
 
-  vendorHash = "sha256-R2UxUaqPaQ1TPYI79rmIHVqTDceuqhSdRb03OqI2fBc=";
+  vendorHash = "sha256-tZUSxfy9wAFausFrEGRrgXZj8PHp6XeF10jPdD4zyDk=";
 
   doCheck = false; # Require access to online S3 services
 

pkgs/by-name/xe/xenia-canary/package.nix

@@ -19,14 +19,14 @@
 }:
 llvmPackages_20.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2025-12-10";
+  version = "0-unstable-2025-12-18";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "4cbcae5b649378d9e839e58e42a121d3a4e69d99";
-    hash = "sha256-VDdwlXAJAIvVWjCDurQdOW96xsykrG8W203bMXSZG/U=";
+    rev = "d78bc3a78934bab4bf609cd3ecee62af2aa3bc48";
+    hash = "sha256-w760nQwqHxsNHJJLogtevRbiqxpo2I7bAUh0N1QfhMY=";
   };
 
   dontConfigure = true;

pkgs/by-name/ya/yara-x/package.nix

@@ -6,8 +6,7 @@
   rustPlatform,
   installShellFiles,
   cargo-c,
-  testers,
-  yara-x,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -23,6 +22,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-CT+walpFIFTaO480ATHO1E38K9Tw14QqLRYzztWQmeA=";
 
+  CARGO_PROFILE_RELEASE_LTO = "fat";
+  CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
+
   nativeBuildInputs = [
     installShellFiles
     cargo-c
@@ -46,10 +48,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # Seems to be flaky
     "--skip=scanner::blocks::tests::block_scanner_timeout"
   ];
+  checkType = "debug";
 
-  passthru.tests.version = testers.testVersion {
-    package = yara-x;
-  };
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
 
   meta = {
     description = "Tool to do pattern matching for malware research";

pkgs/by-name/ya/yazi/plugins/lazygit/default.nix

@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "lazygit.yazi";
-  version = "0-unstable-2025-08-06";
+  version = "0-unstable-2025-12-19";
 
   src = fetchFromGitHub {
     owner = "Lil-Dank";
     repo = "lazygit.yazi";
-    rev = "8f37dc5795f165021098b17d797c7b8f510aeca9";
-    hash = "sha256-rR7SMTtQYrvQjhkzulDaNH/LAA77UnXkcZ50WwBX2Uw=";
+    rev = "ea20d05b4ede88a239830d2b50ba79b1860a3bee";
+    hash = "sha256-uDRd2pDgvYAwrnsKg5U/Dj8ZPtNKzlJRg+YARKjSpCw=";
   };
 
   meta = {

pkgs/development/ada-modules/gnatprove/default.nix

@@ -129,7 +129,7 @@ stdenv.mkDerivation {
     num
     re
     sexplib
-    yojson
+    yojson_2
   ])
   ++ (lib.optionals (gnat_version == "14") [
     gpr2_24_2_next

pkgs/development/coq-modules/vscoq-language-server/default.nix

@@ -62,7 +62,6 @@ ocamlPackages.buildDunePackage {
   ++ (with ocamlPackages; [
     findlib
     lablgtk3-sourceview3
-    yojson
     zarith
     ppx_inline_test
     ppx_assert
@@ -70,7 +69,9 @@ ocamlPackages.buildDunePackage {
     ppx_deriving
     ppx_import
     sexplib
-    ppx_yojson_conv
+    (ppx_yojson_conv.override {
+      ppx_yojson_conv_lib = ppx_yojson_conv_lib.override { yojson = yojson_2; };
+    })
     lsp
     sel
     ppx_optcomp

pkgs/development/lua-modules/generated-packages.nix

@@ -814,15 +814,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fzf-lua";
-      version = "0.0.2365-1";
+      version = "0.0.2384-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.2365-1.rockspec";
-          sha256 = "14d2r59w8nlql07q5f0842lnnpz5v7dj0prwq79p0cj17aq6387h";
+          url = "mirror://luarocks/fzf-lua-0.0.2384-1.rockspec";
+          sha256 = "0aqfz3vj3cxvp4f5mb3gnpi8yz9pjcdc9bh7v3f28sakhhz8wnbm";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/0284d640fd88c56f100a43f41103c5b564699e15.zip";
-        sha256 = "1n0xk82dacgr24dqpp9sskj1a7gpsa6a7y8flispzagi3glg8ww8";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/9d579feab4d3035627150e5e9b6e8fbf5e814ef6.zip";
+        sha256 = "1vw1w5l9jvy35vzd32clpxfrf2fdx3a636yvan23y702qy529fg4";
       };
 
       disabled = luaOlder "5.1";
@@ -903,15 +903,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "grug-far.nvim";
-      version = "1.6.53-1";
+      version = "1.6.55-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/grug-far.nvim-1.6.53-1.rockspec";
-          sha256 = "0wi4b1iv8clspp5nflmf7qfl56dwgclfzvh83wyp6zgp7i1s0rxm";
+          url = "mirror://luarocks/grug-far.nvim-1.6.55-1.rockspec";
+          sha256 = "0b8yh56saq6ksp031qxkxc8pz8fmm2qzlc1sk6v66v0im9i6wlnc";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/MagicDuck/grug-far.nvim/archive/b58b2d65863f4ebad88b10a1ddd519e5380466e0.zip";
-        sha256 = "06g8710k74ymwcm358y6h2c12v4n8wr95nhs2a0514xlqa3khadq";
+        url = "https://github.com/MagicDuck/grug-far.nvim/archive/bc589a1ba340a00ae40bf1436401eac5b1454687.zip";
+        sha256 = "0fsg38lmg5x90z0zym5x1vyylsrqxfp6l54s25r9q5sdsciap03m";
       };
 
       disabled = luaOlder "5.1";
@@ -3590,15 +3590,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "lze";
-      version = "0.11.7-1";
+      version = "0.12.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/lze-0.11.7-1.rockspec";
-          sha256 = "18jj2g81i6b56a9kyg3q1qsrkgvhcz3kgcp419s4bvza8inkzqcq";
+          url = "mirror://luarocks/lze-0.12.0-1.rockspec";
+          sha256 = "104z5r3wqbjinsh89pv8rm32383b3ia8n3r89g8dkbmj118xb93j";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/BirdeeHub/lze/archive/v0.11.7.zip";
-        sha256 = "0zr8pzib9xg8ngvlx536603ji99xwzgjcggxn7f6fl1b2zm4dj6n";
+        url = "https://github.com/BirdeeHub/lze/archive/v0.12.0.zip";
+        sha256 = "0yak34g547yygxrwav021c2bya98zhbc5mkwrsx5zm2vwa4h55pa";
       };
 
       disabled = luaOlder "5.1";
@@ -3841,15 +3841,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "mini.test";
-      version = "0.16.0-1";
+      version = "0.17.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/mini.test-0.16.0-1.rockspec";
-          sha256 = "0gw9cz6iy01c09gzhprrzlz12yz5pvivmjcxywajs1qq0095d5n1";
+          url = "mirror://luarocks/mini.test-0.17.0-1.rockspec";
+          sha256 = "0k9qvizfb3if0r20zid8had91ckkfy061lznvmi4r9hyy421dwfw";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/echasnovski/mini.test/archive/v0.16.0.zip";
-        sha256 = "0si92d4jc7lmzj2mppz0vcmgqgsbgy64fl4bj8jwdl7z78bhpjwk";
+        url = "https://github.com/echasnovski/mini.test/archive/v0.17.0.zip";
+        sha256 = "0hffg59cn8dlhnjnkcfs9vannf10n2j33lna2d8zbaxajxaa8jks";
       };
 
       disabled = luaOlder "5.1";
@@ -3878,8 +3878,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "leafo";
         repo = "moonscript";
-        rev = "3b134e01ebc5961ca132bff5ba2871c88d65347e";
-        hash = "sha256-ijWmxgoi524fbo3oXxuK/cPHxwHyGt3mMrGOw3+TsfY=";
+        rev = "b9768c893bd25c514c6404767fadec29dfd01060";
+        hash = "sha256-wU3zfDS5Df/4VyNPAjKfCs/dK3vm3ln/rCn4i4jCvDw=";
       };
 
       disabled = luaOlder "5.1";
@@ -5031,8 +5031,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "nvim-telescope";
         repo = "telescope.nvim";
-        rev = "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2";
-        hash = "sha256-e6XSJRv4KB0z+nzGWmlV/YZNwWsyrrpQTloePRKWmw4=";
+        rev = "3d757e586ff0bfc85bdb7b46c9d3d932147a0cde";
+        hash = "sha256-PUqDSm6My5vNoPNKE9KQLfASnx3tlUy+EsXn1wdbSO0=";
       };
 
       disabled = lua.luaversion != "5.1";

pkgs/development/node-packages/aliases.nix

@@ -399,6 +399,7 @@ mapAliases {
   inherit (pkgs) ungit; # added 2023-08-20
   unified-language-server = throw "unified-language-server was removed as it is a library that should be imported within a Javascript project, not an end-user tool"; # added 2025-10-02
   inherit (pkgs) uppy-companion; # Added 2025-11-01
+  inherit (pkgs) vega-cli; # Added 2025-12-18
   inherit (pkgs) vega-lite; # Added 2025-11-04
   inherit (pkgs) vim-language-server; # added 2024-06-25
   vls = throw "vls has been deprecated by upstream as vetur is also deprecated. Upstream suggests migrating to Volar for Vue LSP tooling instead."; # added 2024-12-09

pkgs/development/node-packages/node-packages.json

@@ -22,7 +22,6 @@
 , "postcss"
 , "sass"
 , "semver"
-, "vega-cli"
 , "vercel"
 , "wavedrom-cli"
 ]

pkgs/development/node-packages/node-packages.nix

@@ -1200,15 +1200,6 @@ let
         sha512 = "0hz44rAcrphyXcA8IS7EJ2SCoaBZD2u5goE8S/e+q/DL+dOGpqpcLidVOFeLG3VgML62SXmfRLAhWt0zL1oW4Q==";
       };
     };
-    "@mapbox/node-pre-gyp-1.0.11" = {
-      name = "_at_mapbox_slash_node-pre-gyp";
-      packageName = "@mapbox/node-pre-gyp";
-      version = "1.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz";
-        sha512 = "Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==";
-      };
-    };
     "@mapbox/node-pre-gyp-2.0.0" = {
       name = "_at_mapbox_slash_node-pre-gyp";
       packageName = "@mapbox/node-pre-gyp";
@@ -2460,15 +2451,6 @@ let
         sha512 = "52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==";
       };
     };
-    "@types/geojson-7946.0.4" = {
-      name = "_at_types_slash_geojson";
-      packageName = "@types/geojson";
-      version = "7946.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.4.tgz";
-        sha512 = "MHmwBtCb7OCv1DSivz2UNJXPGU/1btAWRKlqJ2saEhVJkpkvqHMMaOpKg0v4sAbDWSQekHGvPVMM8nQ+Jen03Q==";
-      };
-    };
     "@types/get-stdin-5.0.1" = {
       name = "_at_types_slash_get-stdin";
       packageName = "@types/get-stdin";
@@ -3306,15 +3288,6 @@ let
         sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==";
       };
     };
-    "aproba-2.0.0" = {
-      name = "aproba";
-      packageName = "aproba";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz";
-        sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==";
-      };
-    };
     "arch-2.2.0" = {
       name = "arch";
       packageName = "arch";
@@ -3351,15 +3324,6 @@ let
         sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==";
       };
     };
-    "are-we-there-yet-2.0.0" = {
-      name = "are-we-there-yet";
-      packageName = "are-we-there-yet";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz";
-        sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==";
-      };
-    };
     "arg-4.1.0" = {
       name = "arg";
       packageName = "arg";
@@ -4386,15 +4350,6 @@ let
         sha512 = "qMKdlOfsjlezMqxkUGGMaWWs17i2HoL15tM+wtx8ld4nLrUwU58TFdvyGOz/piNP842KeO8yXvggVQSdQ828NA==";
       };
     };
-    "canvas-2.11.2" = {
-      name = "canvas";
-      packageName = "canvas";
-      version = "2.11.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz";
-        sha512 = "ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==";
-      };
-    };
     "cardinal-2.1.1" = {
       name = "cardinal";
       packageName = "cardinal";
@@ -4890,15 +4845,6 @@ let
         sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==";
       };
     };
-    "color-support-1.1.3" = {
-      name = "color-support";
-      packageName = "color-support";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz";
-        sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==";
-      };
-    };
     "colorette-2.0.20" = {
       name = "colorette";
       packageName = "colorette";
@@ -4971,15 +4917,6 @@ let
         sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
       };
     };
-    "commander-7.2.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "7.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz";
-        sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==";
-      };
-    };
     "comment-json-4.2.5" = {
       name = "comment-json";
       packageName = "comment-json";
@@ -5439,177 +5376,6 @@ let
         sha512 = "p6JFxJc3M4OTD2li2qaHkDCw9SfMw82Ldr6OC9Je1aXiGfhx2W8p3GaoeaGrPJTUN9NirTM/KTxHWMUdR1rsUg==";
       };
     };
-    "d3-array-3.2.4" = {
-      name = "d3-array";
-      packageName = "d3-array";
-      version = "3.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz";
-        sha512 = "tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==";
-      };
-    };
-    "d3-color-3.1.0" = {
-      name = "d3-color";
-      packageName = "d3-color";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz";
-        sha512 = "zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==";
-      };
-    };
-    "d3-delaunay-6.0.4" = {
-      name = "d3-delaunay";
-      packageName = "d3-delaunay";
-      version = "6.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-6.0.4.tgz";
-        sha512 = "mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==";
-      };
-    };
-    "d3-dispatch-3.0.1" = {
-      name = "d3-dispatch";
-      packageName = "d3-dispatch";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz";
-        sha512 = "rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==";
-      };
-    };
-    "d3-dsv-3.0.1" = {
-      name = "d3-dsv";
-      packageName = "d3-dsv";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz";
-        sha512 = "UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==";
-      };
-    };
-    "d3-force-3.0.0" = {
-      name = "d3-force";
-      packageName = "d3-force";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz";
-        sha512 = "zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==";
-      };
-    };
-    "d3-format-3.1.0" = {
-      name = "d3-format";
-      packageName = "d3-format";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz";
-        sha512 = "YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==";
-      };
-    };
-    "d3-geo-3.1.1" = {
-      name = "d3-geo";
-      packageName = "d3-geo";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz";
-        sha512 = "637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==";
-      };
-    };
-    "d3-geo-projection-4.0.0" = {
-      name = "d3-geo-projection";
-      packageName = "d3-geo-projection";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-4.0.0.tgz";
-        sha512 = "p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg==";
-      };
-    };
-    "d3-hierarchy-3.1.2" = {
-      name = "d3-hierarchy";
-      packageName = "d3-hierarchy";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz";
-        sha512 = "FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==";
-      };
-    };
-    "d3-interpolate-3.0.1" = {
-      name = "d3-interpolate";
-      packageName = "d3-interpolate";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz";
-        sha512 = "3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==";
-      };
-    };
-    "d3-path-3.1.0" = {
-      name = "d3-path";
-      packageName = "d3-path";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz";
-        sha512 = "p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==";
-      };
-    };
-    "d3-quadtree-3.0.1" = {
-      name = "d3-quadtree";
-      packageName = "d3-quadtree";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz";
-        sha512 = "04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==";
-      };
-    };
-    "d3-scale-4.0.2" = {
-      name = "d3-scale";
-      packageName = "d3-scale";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz";
-        sha512 = "GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==";
-      };
-    };
-    "d3-scale-chromatic-3.1.0" = {
-      name = "d3-scale-chromatic";
-      packageName = "d3-scale-chromatic";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz";
-        sha512 = "A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==";
-      };
-    };
-    "d3-shape-3.2.0" = {
-      name = "d3-shape";
-      packageName = "d3-shape";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz";
-        sha512 = "SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==";
-      };
-    };
-    "d3-time-3.1.0" = {
-      name = "d3-time";
-      packageName = "d3-time";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz";
-        sha512 = "VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==";
-      };
-    };
-    "d3-time-format-4.1.0" = {
-      name = "d3-time-format";
-      packageName = "d3-time-format";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz";
-        sha512 = "dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==";
-      };
-    };
-    "d3-timer-3.0.1" = {
-      name = "d3-timer";
-      packageName = "d3-timer";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz";
-        sha512 = "ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==";
-      };
-    };
     "dash-ast-1.0.0" = {
       name = "dash-ast";
       packageName = "dash-ast";
@@ -5718,15 +5484,6 @@ let
         sha512 = "BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==";
       };
     };
-    "decompress-response-4.2.1" = {
-      name = "decompress-response";
-      packageName = "decompress-response";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz";
-        sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==";
-      };
-    };
     "decompress-response-6.0.0" = {
       name = "decompress-response";
       packageName = "decompress-response";
@@ -5817,15 +5574,6 @@ let
         sha512 = "hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==";
       };
     };
-    "delaunator-5.0.1" = {
-      name = "delaunator";
-      packageName = "delaunator";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/delaunator/-/delaunator-5.0.1.tgz";
-        sha512 = "8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==";
-      };
-    };
     "delay-5.0.0" = {
       name = "delay";
       packageName = "delay";
@@ -7518,15 +7266,6 @@ let
         sha512 = "14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==";
       };
     };
-    "gauge-3.0.2" = {
-      name = "gauge";
-      packageName = "gauge";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz";
-        sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==";
-      };
-    };
     "generic-pool-3.4.2" = {
       name = "generic-pool";
       packageName = "generic-pool";
@@ -8742,15 +8481,6 @@ let
         sha512 = "becs5gzcHwPrlHawscYkyQ/ShiOiosrXPhA5RVZ3qyWH4aWdD52RnMfXq/dwQXciHwiieD8aIPwdIWYv6eL+sQ==";
       };
     };
-    "internmap-2.0.3" = {
-      name = "internmap";
-      packageName = "internmap";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz";
-        sha512 = "5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==";
-      };
-    };
     "interpret-1.1.0" = {
       name = "interpret";
       packageName = "interpret";
@@ -11244,15 +10974,6 @@ let
         sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
       };
     };
-    "mimic-response-2.1.0" = {
-      name = "mimic-response";
-      packageName = "mimic-response";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz";
-        sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==";
-      };
-    };
     "mimic-response-3.1.0" = {
       name = "mimic-response";
       packageName = "mimic-response";
@@ -11667,15 +11388,6 @@ let
         sha512 = "2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==";
       };
     };
-    "nan-2.22.2" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.22.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz";
-        sha512 = "DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==";
-      };
-    };
     "nanoid-3.3.9" = {
       name = "nanoid";
       packageName = "nanoid";
@@ -11856,15 +11568,6 @@ let
         sha512 = "DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==";
       };
     };
-    "node-fetch-2.7.0" = {
-      name = "node-fetch";
-      packageName = "node-fetch";
-      version = "2.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz";
-        sha512 = "c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==";
-      };
-    };
     "node-fetch-h2-2.3.0" = {
       name = "node-fetch-h2";
       packageName = "node-fetch-h2";
@@ -12144,15 +11847,6 @@ let
         sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==";
       };
     };
-    "npmlog-5.0.1" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz";
-        sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==";
-      };
-    };
     "number-allocator-1.0.14" = {
       name = "number-allocator";
       packageName = "number-allocator";
@@ -14367,15 +14061,6 @@ let
         sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==";
       };
     };
-    "rimraf-3.0.2" = {
-      name = "rimraf";
-      packageName = "rimraf";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz";
-        sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==";
-      };
-    };
     "rimraf-5.0.10" = {
       name = "rimraf";
       packageName = "rimraf";
@@ -14394,15 +14079,6 @@ let
         sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==";
       };
     };
-    "robust-predicates-3.0.2" = {
-      name = "robust-predicates";
-      packageName = "robust-predicates";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/robust-predicates/-/robust-predicates-3.0.2.tgz";
-        sha512 = "IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==";
-      };
-    };
     "rollup-4.35.0" = {
       name = "rollup";
       packageName = "rollup";
@@ -14430,15 +14106,6 @@ let
         sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==";
       };
     };
-    "rw-1.3.3" = {
-      name = "rw";
-      packageName = "rw";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz";
-        sha512 = "PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==";
-      };
-    };
     "rx-4.1.0" = {
       name = "rx";
       packageName = "rx";
@@ -14988,15 +14655,6 @@ let
         sha512 = "LH7FpTAkeD+y5xQC4fzS+tFtaNlvt3Ib1zKzvhjv/Y+cioV4zIuw4IZr2yhRLu67CWL7FR9/6KXKnjRoZTvGGQ==";
       };
     };
-    "simple-get-3.1.1" = {
-      name = "simple-get";
-      packageName = "simple-get";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz";
-        sha512 = "CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==";
-      };
-    };
     "simple-get-4.0.1" = {
       name = "simple-get";
       packageName = "simple-get";
@@ -16095,15 +15753,6 @@ let
         sha512 = "6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ==";
       };
     };
-    "topojson-client-3.1.0" = {
-      name = "topojson-client";
-      packageName = "topojson-client";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz";
-        sha512 = "605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==";
-      };
-    };
     "tough-cookie-2.5.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
@@ -17004,276 +16653,6 @@ let
         sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==";
       };
     };
-    "vega-5.32.0" = {
-      name = "vega";
-      packageName = "vega";
-      version = "5.32.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega/-/vega-5.32.0.tgz";
-        sha512 = "jANt/5+SpV7b7owB5u8+M1TZ/TrF1fK6WlcvKDW38tH3Gb6hM1nzIhv10E41w3GBmwF29BU/qH2ruNkaYKjI5g==";
-      };
-    };
-    "vega-canvas-1.2.7" = {
-      name = "vega-canvas";
-      packageName = "vega-canvas";
-      version = "1.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-canvas/-/vega-canvas-1.2.7.tgz";
-        sha512 = "OkJ9CACVcN9R5Pi9uF6MZBF06pO6qFpDYHWSKBJsdHP5o724KrsgR6UvbnXFH82FdsiTOff/HqjuaG8C7FL+9Q==";
-      };
-    };
-    "vega-crossfilter-4.1.3" = {
-      name = "vega-crossfilter";
-      packageName = "vega-crossfilter";
-      version = "4.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.1.3.tgz";
-        sha512 = "nyPJAXAUABc3EocUXvAL1J/IWotZVsApIcvOeZaUdEQEtZ7bt8VtP2nj3CLbHBA8FZZVV+K6SmdwvCOaAD4wFQ==";
-      };
-    };
-    "vega-dataflow-5.7.7" = {
-      name = "vega-dataflow";
-      packageName = "vega-dataflow";
-      version = "5.7.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-dataflow/-/vega-dataflow-5.7.7.tgz";
-        sha512 = "R2NX2HvgXL+u4E6u+L5lKvvRiCtnE6N6l+umgojfi53suhhkFP+zB+2UAQo4syxuZ4763H1csfkKc4xpqLzKnw==";
-      };
-    };
-    "vega-encode-4.10.2" = {
-      name = "vega-encode";
-      packageName = "vega-encode";
-      version = "4.10.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-encode/-/vega-encode-4.10.2.tgz";
-        sha512 = "fsjEY1VaBAmqwt7Jlpz0dpPtfQFiBdP9igEefvumSpy7XUxOJmDQcRDnT3Qh9ctkv3itfPfI9g8FSnGcv2b4jQ==";
-      };
-    };
-    "vega-event-selector-3.0.1" = {
-      name = "vega-event-selector";
-      packageName = "vega-event-selector";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-3.0.1.tgz";
-        sha512 = "K5zd7s5tjr1LiOOkjGpcVls8GsH/f2CWCrWcpKy74gTCp+llCdwz0Enqo013ZlGaRNjfgD/o1caJRt3GSaec4A==";
-      };
-    };
-    "vega-expression-5.2.0" = {
-      name = "vega-expression";
-      packageName = "vega-expression";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-expression/-/vega-expression-5.2.0.tgz";
-        sha512 = "WRMa4ny3iZIVAzDlBh3ipY2QUuLk2hnJJbfbncPgvTF7BUgbIbKq947z+JicWksYbokl8n1JHXJoqi3XvpG0Zw==";
-      };
-    };
-    "vega-force-4.2.2" = {
-      name = "vega-force";
-      packageName = "vega-force";
-      version = "4.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-force/-/vega-force-4.2.2.tgz";
-        sha512 = "cHZVaY2VNNIG2RyihhSiWniPd2W9R9kJq0znxzV602CgUVgxEfTKtx/lxnVCn8nNrdKAYrGiqIsBzIeKG1GWHw==";
-      };
-    };
-    "vega-format-1.1.3" = {
-      name = "vega-format";
-      packageName = "vega-format";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-format/-/vega-format-1.1.3.tgz";
-        sha512 = "wQhw7KR46wKJAip28FF/CicW+oiJaPAwMKdrxlnTA0Nv8Bf7bloRlc+O3kON4b4H1iALLr9KgRcYTOeXNs2MOA==";
-      };
-    };
-    "vega-functions-5.17.0" = {
-      name = "vega-functions";
-      packageName = "vega-functions";
-      version = "5.17.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.17.0.tgz";
-        sha512 = "EoGvdCtv1Y4M/hLy83Kf0HTs4qInUfrBoanrnhbguzRl00rx7orjcv+bNZFHbCe4HkfVpbOnTrYmz3K2ivaOLw==";
-      };
-    };
-    "vega-geo-4.4.3" = {
-      name = "vega-geo";
-      packageName = "vega-geo";
-      version = "4.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.4.3.tgz";
-        sha512 = "+WnnzEPKIU1/xTFUK3EMu2htN35gp9usNZcC0ZFg2up1/Vqu6JyZsX0PIO51oXSIeXn9bwk6VgzlOmJUcx92tA==";
-      };
-    };
-    "vega-hierarchy-4.1.3" = {
-      name = "vega-hierarchy";
-      packageName = "vega-hierarchy";
-      version = "4.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.1.3.tgz";
-        sha512 = "0Z+TYKRgOEo8XYXnJc2HWg1EGpcbNAhJ9Wpi9ubIbEyEHqIgjCIyFVN8d4nSfsJOcWDzsSmRqohBztxAhOCSaw==";
-      };
-    };
-    "vega-label-1.3.1" = {
-      name = "vega-label";
-      packageName = "vega-label";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-label/-/vega-label-1.3.1.tgz";
-        sha512 = "Emx4b5s7pvuRj3fBkAJ/E2snCoZACfKAwxVId7f/4kYVlAYLb5Swq6W8KZHrH4M9Qds1XJRUYW9/Y3cceqzEFA==";
-      };
-    };
-    "vega-loader-4.5.3" = {
-      name = "vega-loader";
-      packageName = "vega-loader";
-      version = "4.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.5.3.tgz";
-        sha512 = "dUfIpxTLF2magoMaur+jXGvwMxjtdlDZaIS8lFj6N7IhUST6nIvBzuUlRM+zLYepI5GHtCLOnqdKU4XV0NggCA==";
-      };
-    };
-    "vega-parser-6.5.0" = {
-      name = "vega-parser";
-      packageName = "vega-parser";
-      version = "6.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.5.0.tgz";
-        sha512 = "dPxFKn6IlDyWi6CgHGGv8htSPBAyLHWlJNNGD17eMXh+Kjn4hupSNOIboRcYb8gL5HYt1tYwS6oYZXK84Bc4tg==";
-      };
-    };
-    "vega-projection-1.6.2" = {
-      name = "vega-projection";
-      packageName = "vega-projection";
-      version = "1.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-projection/-/vega-projection-1.6.2.tgz";
-        sha512 = "3pcVaQL9R3Zfk6PzopLX6awzrQUeYOXJzlfLGP2Xd93mqUepBa6m/reVrTUoSFXA3v9lfK4W/PS2AcVzD/MIcQ==";
-      };
-    };
-    "vega-regression-1.3.1" = {
-      name = "vega-regression";
-      packageName = "vega-regression";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.3.1.tgz";
-        sha512 = "AmccF++Z9uw4HNZC/gmkQGe6JsRxTG/R4QpbcSepyMvQN1Rj5KtVqMcmVFP1r3ivM4dYGFuPlzMWvuqp0iKMkQ==";
-      };
-    };
-    "vega-runtime-6.2.1" = {
-      name = "vega-runtime";
-      packageName = "vega-runtime";
-      version = "6.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.2.1.tgz";
-        sha512 = "b4eot3tWKCk++INWqot+6sLn3wDTj/HE+tRSbiaf8aecuniPMlwJEK7wWuhVGeW2Ae5n8fI/8TeTViaC94bNHA==";
-      };
-    };
-    "vega-scale-7.4.2" = {
-      name = "vega-scale";
-      packageName = "vega-scale";
-      version = "7.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.4.2.tgz";
-        sha512 = "o6Hl76aU1jlCK7Q8DPYZ8OGsp4PtzLdzI6nGpLt8rxoE78QuB3GBGEwGAQJitp4IF7Lb2rL5oAXEl3ZP6xf9jg==";
-      };
-    };
-    "vega-scenegraph-4.13.1" = {
-      name = "vega-scenegraph";
-      packageName = "vega-scenegraph";
-      version = "4.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.13.1.tgz";
-        sha512 = "LFY9+sLIxRfdDI9ZTKjLoijMkIAzPLBWHpPkwv4NPYgdyx+0qFmv+puBpAUGUY9VZqAZ736Uj5NJY9zw+/M3yQ==";
-      };
-    };
-    "vega-selections-5.6.0" = {
-      name = "vega-selections";
-      packageName = "vega-selections";
-      version = "5.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.6.0.tgz";
-        sha512 = "UE2w78rUUbaV3Ph+vQbQDwh8eywIJYRxBiZdxEG/Tr/KtFMLdy2BDgNZuuDO1Nv8jImPJwONmqjNhNDYwM0VJQ==";
-      };
-    };
-    "vega-statistics-1.9.0" = {
-      name = "vega-statistics";
-      packageName = "vega-statistics";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.9.0.tgz";
-        sha512 = "GAqS7mkatpXcMCQKWtFu1eMUKLUymjInU0O8kXshWaQrVWjPIO2lllZ1VNhdgE0qGj4oOIRRS11kzuijLshGXQ==";
-      };
-    };
-    "vega-time-2.1.3" = {
-      name = "vega-time";
-      packageName = "vega-time";
-      version = "2.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-time/-/vega-time-2.1.3.tgz";
-        sha512 = "hFcWPdTV844IiY0m97+WUoMLADCp+8yUQR1NStWhzBzwDDA7QEGGwYGxALhdMOaDTwkyoNj3V/nox2rQAJD/vQ==";
-      };
-    };
-    "vega-transforms-4.12.1" = {
-      name = "vega-transforms";
-      packageName = "vega-transforms";
-      version = "4.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.12.1.tgz";
-        sha512 = "Qxo+xeEEftY1jYyKgzOGc9NuW4/MqGm1YPZ5WrL9eXg2G0410Ne+xL/MFIjHF4hRX+3mgFF4Io2hPpfy/thjLg==";
-      };
-    };
-    "vega-typings-1.5.0" = {
-      name = "vega-typings";
-      packageName = "vega-typings";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-typings/-/vega-typings-1.5.0.tgz";
-        sha512 = "tcZ2HwmiQEOXIGyBMP8sdCnoFoVqHn4KQ4H0MQiHwzFU1hb1EXURhfc+Uamthewk4h/9BICtAM3AFQMjBGpjQA==";
-      };
-    };
-    "vega-util-1.17.3" = {
-      name = "vega-util";
-      packageName = "vega-util";
-      version = "1.17.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-util/-/vega-util-1.17.3.tgz";
-        sha512 = "nSNpZLUrRvFo46M5OK4O6x6f08WD1yOcEzHNlqivF+sDLSsVpstaF6fdJYwrbf/debFi2L9Tkp4gZQtssup9iQ==";
-      };
-    };
-    "vega-view-5.15.0" = {
-      name = "vega-view";
-      packageName = "vega-view";
-      version = "5.15.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-view/-/vega-view-5.15.0.tgz";
-        sha512 = "bm8STHPsI8BjVu2gYlWU8KEVOA2JyTzdtb9cJj8NW6HpN72UxTYsg5y22u9vfcLYjzjmolrlr0756VXR0uI1Cg==";
-      };
-    };
-    "vega-view-transforms-4.6.1" = {
-      name = "vega-view-transforms";
-      packageName = "vega-view-transforms";
-      version = "4.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.6.1.tgz";
-        sha512 = "RYlyMJu5kZV4XXjmyTQKADJWDB25SMHsiF+B1rbE1p+pmdQPlp5tGdPl9r5dUJOp3p8mSt/NGI8GPGucmPMxtw==";
-      };
-    };
-    "vega-voronoi-4.2.4" = {
-      name = "vega-voronoi";
-      packageName = "vega-voronoi";
-      version = "4.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.4.tgz";
-        sha512 = "lWNimgJAXGeRFu2Pz8axOUqVf1moYhD+5yhBzDSmckE9I5jLOyZc/XvgFTXwFnsVkMd1QW1vxJa+y9yfUblzYw==";
-      };
-    };
-    "vega-wordcloud-4.1.6" = {
-      name = "vega-wordcloud";
-      packageName = "vega-wordcloud";
-      version = "4.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-wordcloud/-/vega-wordcloud-4.1.6.tgz";
-        sha512 = "lFmF3u9/ozU0P+WqPjeThQfZm0PigdbXDwpIUCxczrCXKYJLYFmZuZLZR7cxtmpZ0/yuvRvAJ4g123LXbSZF8A==";
-      };
-    };
     "verror-1.10.0" = {
       name = "verror";
       packageName = "verror";
@@ -21700,185 +21079,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  vega-cli = nodeEnv.buildNodePackage {
-    name = "vega-cli";
-    packageName = "vega-cli";
-    version = "5.32.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.32.0.tgz";
-      sha512 = "k3PQ6HDp/GgJUBNKN/KdyfVX1JoVGtjdH8uYZKxXZo7Fmky9yMmdw8+vLzcLinaLDsUdUPhh8oiTC6+wdjipAA==";
-    };
-    dependencies = [
-      sources."@mapbox/node-pre-gyp-1.0.11"
-      sources."@types/estree-1.0.6"
-      sources."@types/geojson-7946.0.4"
-      sources."abbrev-1.1.1"
-      sources."agent-base-6.0.2"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."aproba-2.0.0"
-      sources."are-we-there-yet-2.0.0"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."canvas-2.11.2"
-      sources."chownr-2.0.0"
-      sources."cliui-8.0.1"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."color-support-1.1.3"
-      sources."commander-7.2.0"
-      sources."concat-map-0.0.1"
-      sources."console-control-strings-1.1.0"
-      sources."d3-array-3.2.4"
-      sources."d3-color-3.1.0"
-      sources."d3-delaunay-6.0.4"
-      sources."d3-dispatch-3.0.1"
-      sources."d3-dsv-3.0.1"
-      sources."d3-force-3.0.0"
-      sources."d3-format-3.1.0"
-      sources."d3-geo-3.1.1"
-      sources."d3-geo-projection-4.0.0"
-      sources."d3-hierarchy-3.1.2"
-      sources."d3-interpolate-3.0.1"
-      sources."d3-path-3.1.0"
-      sources."d3-quadtree-3.0.1"
-      sources."d3-scale-4.0.2"
-      sources."d3-scale-chromatic-3.1.0"
-      sources."d3-shape-3.2.0"
-      sources."d3-time-3.1.0"
-      sources."d3-time-format-4.1.0"
-      sources."d3-timer-3.0.1"
-      sources."debug-4.4.0"
-      sources."decompress-response-4.2.1"
-      sources."delaunator-5.0.1"
-      sources."delegates-1.0.0"
-      sources."detect-libc-2.0.3"
-      sources."emoji-regex-8.0.0"
-      sources."encoding-0.1.13"
-      sources."escalade-3.2.0"
-      (
-        sources."fs-minipass-2.1.0"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."fs.realpath-1.0.0"
-      sources."gauge-3.0.2"
-      sources."get-caller-file-2.0.5"
-      sources."glob-7.2.3"
-      sources."has-unicode-2.0.1"
-      sources."https-proxy-agent-5.0.1"
-      sources."iconv-lite-0.6.3"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."internmap-2.0.3"
-      sources."is-fullwidth-code-point-3.0.0"
-      (
-        sources."make-dir-3.1.0"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."mimic-response-2.1.0"
-      sources."minimatch-3.1.2"
-      sources."minipass-5.0.0"
-      (
-        sources."minizlib-2.1.2"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."mkdirp-1.0.4"
-      sources."ms-2.1.3"
-      sources."nan-2.22.2"
-      sources."node-fetch-2.7.0"
-      sources."nopt-5.0.0"
-      sources."npmlog-5.0.1"
-      sources."object-assign-4.1.1"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."readable-stream-3.6.2"
-      sources."require-directory-2.1.1"
-      sources."rimraf-3.0.2"
-      sources."robust-predicates-3.0.2"
-      sources."rw-1.3.3"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."semver-7.7.1"
-      sources."set-blocking-2.0.0"
-      sources."signal-exit-3.0.7"
-      sources."simple-concat-1.0.1"
-      sources."simple-get-3.1.1"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."tar-6.2.1"
-      (
-        sources."topojson-client-3.1.0"
-        // {
-          dependencies = [
-            sources."commander-2.20.3"
-          ];
-        }
-      )
-      sources."tr46-0.0.3"
-      sources."util-deprecate-1.0.2"
-      sources."vega-5.32.0"
-      sources."vega-canvas-1.2.7"
-      sources."vega-crossfilter-4.1.3"
-      sources."vega-dataflow-5.7.7"
-      sources."vega-encode-4.10.2"
-      sources."vega-event-selector-3.0.1"
-      sources."vega-expression-5.2.0"
-      sources."vega-force-4.2.2"
-      sources."vega-format-1.1.3"
-      sources."vega-functions-5.17.0"
-      sources."vega-geo-4.4.3"
-      sources."vega-hierarchy-4.1.3"
-      sources."vega-label-1.3.1"
-      sources."vega-loader-4.5.3"
-      sources."vega-parser-6.5.0"
-      sources."vega-projection-1.6.2"
-      sources."vega-regression-1.3.1"
-      sources."vega-runtime-6.2.1"
-      sources."vega-scale-7.4.2"
-      sources."vega-scenegraph-4.13.1"
-      sources."vega-selections-5.6.0"
-      sources."vega-statistics-1.9.0"
-      sources."vega-time-2.1.3"
-      sources."vega-transforms-4.12.1"
-      sources."vega-typings-1.5.0"
-      sources."vega-util-1.17.3"
-      sources."vega-view-5.15.0"
-      sources."vega-view-transforms-4.6.1"
-      sources."vega-voronoi-4.2.4"
-      sources."vega-wordcloud-4.1.6"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."wide-align-1.1.5"
-      sources."wrap-ansi-7.0.0"
-      sources."wrappy-1.0.2"
-      sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
-      sources."yargs-17.7.2"
-      sources."yargs-parser-21.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Command line utilities for server-side Vega";
-      homepage = "https://github.com/vega/vega#readme";
-      license = "BSD-3-Clause";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   vercel = nodeEnv.buildNodePackage {
     name = "vercel";
     packageName = "vercel";

pkgs/development/node-packages/overrides.nix

@@ -80,17 +80,6 @@ final: prev: {
     name = "rush";
   };
 
-  vega-cli = prev.vega-cli.override {
-    nativeBuildInputs = [ pkgs.pkg-config ];
-    buildInputs = with pkgs; [
-      node-pre-gyp
-      pixman
-      cairo
-      pango
-      libjpeg
-    ];
-  };
-
   wavedrom-cli = prev.wavedrom-cli.override {
     nativeBuildInputs = [
       pkgs.pkg-config

pkgs/development/ocaml-modules/atd/default.nix

@@ -14,8 +14,6 @@ buildDunePackage {
   pname = "atd";
   inherit (atdgen-codec-runtime) version src;
 
-  minimalOCamlVersion = "4.08";
-
   nativeBuildInputs = [ menhir ];
   buildInputs = [ cmdliner ];
   propagatedBuildInputs = [

pkgs/development/ocaml-modules/atdgen/codec-runtime.nix

@@ -4,13 +4,13 @@
   fetchurl,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "atdgen-codec-runtime";
-  version = "2.16.0";
+  version = "3.0.1";
 
   src = fetchurl {
-    url = "https://github.com/ahrefs/atd/releases/download/${version}/atd-${version}.tbz";
-    hash = "sha256-Wea0RWICQcvWkBqEKzNmg6+w6xJbOtv+4ovZTNVODe8=";
+    url = "https://github.com/ahrefs/atd/releases/download/${finalAttrs.version}/atd-${finalAttrs.version}.tbz";
+    hash = "sha256-A66uRWWjLYu2ishRSvXvx4ALFhnClzlBynE4sSs0SIQ=";
   };
 
   meta = {
@@ -19,4 +19,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
     license = lib.licenses.mit;
   };
-}
+})

pkgs/development/ocaml-modules/github/unix.nix

@@ -1,5 +1,6 @@
 {
   buildDunePackage,
+  fetchpatch,
   github,
   cohttp,
   cohttp-lwt-unix,
@@ -12,6 +13,14 @@ buildDunePackage {
   pname = "github-unix";
   inherit (github) version src;
 
+  patches = [
+    # Compatibility with yojson 3.0
+    (fetchpatch {
+      url = "https://github.com/mirage/ocaml-github/commit/487d7d413363921a8ffbb941610c2f71c811add8.patch";
+      hash = "sha256-ThCsWRQKmlRg7rk8tlorsO87v8RWnBvocHDvgg/WWMA=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace unix/dune --replace 'github bytes' 'github'
   '';

pkgs/development/ocaml-modules/linol/default.nix

@@ -6,7 +6,6 @@
   ppx_yojson_conv_lib,
   trace,
   uutf,
-  yojson,
 }:
 
 buildDunePackage (finalAttrs: {
@@ -27,7 +26,6 @@ buildDunePackage (finalAttrs: {
     ppx_yojson_conv_lib
     trace
     uutf
-    yojson
   ];
 
   meta = {

pkgs/development/ocaml-modules/linol/eio.nix

@@ -2,7 +2,6 @@
   buildDunePackage,
   eio,
   linol,
-  yojson,
 }:
 
 buildDunePackage {
@@ -12,7 +11,6 @@ buildDunePackage {
   propagatedBuildInputs = [
     eio
     linol
-    yojson
   ];
 
   meta = linol.meta // {

pkgs/development/ocaml-modules/linol/lwt.nix

@@ -2,7 +2,6 @@
   buildDunePackage,
   linol,
   lwt,
-  yojson,
 }:
 
 buildDunePackage {
@@ -12,7 +11,6 @@ buildDunePackage {
   propagatedBuildInputs = [
     linol
     lwt
-    yojson
   ];
 
   meta = linol.meta // {

pkgs/development/ocaml-modules/morbig/default.nix

@@ -7,7 +7,6 @@
   menhirLib,
   ppx_deriving_yojson,
   visitors,
-  yojson,
 }:
 
 lib.throwIf (lib.versionAtLeast ocaml.version "5.4")
@@ -33,7 +32,6 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.4")
       menhirLib
       ppx_deriving_yojson
       visitors
-      yojson
     ];
 
     meta = {

pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix

@@ -4,6 +4,7 @@
   cppo,
   stdlib-shims,
   ppx_yojson_conv_lib,
+  yojson_2,
   ocaml-syntax-shims,
   jsonrpc,
   omd,
@@ -62,7 +63,6 @@ buildDunePackage rec {
       [
         pp
         re
-        ppx_yojson_conv_lib
         octavius
         dune-build-info
         dune-rpc
@@ -77,7 +77,6 @@ buildDunePackage rec {
       [
         pp
         re
-        ppx_yojson_conv_lib
         octavius
         dune-build-info
         dune-rpc
@@ -109,21 +108,36 @@ buildDunePackage rec {
   nativeBuildInputs = lib.optional (lib.versionOlder version "1.7.0") cppo;
 
   propagatedBuildInputs =
-    if lib.versionAtLeast version "1.14.0" then
+    if lib.versionAtLeast version "1.23.1" then
       [
         jsonrpc
         ppx_yojson_conv_lib
         uutf
       ]
+    else if lib.versionAtLeast version "1.14.0" then
+      [
+        jsonrpc
+        (ppx_yojson_conv_lib.override { yojson = yojson_2; })
+        uutf
+      ]
     else if lib.versionAtLeast version "1.10.0" then
       [
         dyn
         jsonrpc
         ordering
-        ppx_yojson_conv_lib
+        (ppx_yojson_conv_lib.override { yojson = yojson_2; })
         stdune
         uutf
       ]
+    else if lib.versionAtLeast version "1.9.0" then
+      [
+        csexp
+        jsonrpc
+        (pp.override { version = "1.2.0"; })
+        (ppx_yojson_conv_lib.override { yojson = yojson_2; })
+        result
+        uutf
+      ]
     else if lib.versionAtLeast version "1.7.0" then
       [
         csexp

pkgs/development/ocaml-modules/ocf/default.nix

@@ -5,17 +5,16 @@
   yojson,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocf";
   version = "0.9.0";
-  duneVersion = "3";
-  minimalOCamlVersion = "4.03";
+  patches = ./yojson.patch;
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "zoggy";
     repo = "ocf";
-    rev = version;
-    sha256 = "sha256-tTNpvncLO/WfcMbjqRfqzcdPv2Bd877fOU5AZlkkcXA=";
+    tag = finalAttrs.version;
+    hash = "sha256-tTNpvncLO/WfcMbjqRfqzcdPv2Bd877fOU5AZlkkcXA=";
   };
 
   propagatedBuildInputs = [ yojson ];
@@ -26,4 +25,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl3;
     maintainers = with lib.maintainers; [ regnat ];
   };
-}
+})

pkgs/development/ocaml-modules/ocf/yojson.patch

@@ -0,0 +1,60 @@
+From caf5430f30830a2222bd7d0e6c5cea7b632e4a6a Mon Sep 17 00:00:00 2001
+From: Zoggy <zoggy@bat8.org>
+Date: Wed, 22 Oct 2025 11:41:52 +0200
+Subject: [PATCH] support Yojson >= 3.0: do not use `Tuple any more, use `List
+ instead
+
+---
+ Changes    |  3 +++
+ lib/ocf.ml | 14 +++++---------
+ 2 files changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/lib/ocf.ml b/lib/ocf.ml
+index 3169d13..3ac98a4 100644
+--- a/lib/ocf.ml
++++ b/lib/ocf.ml
+@@ -130,8 +130,7 @@ module Wrapper =
+     let list w =
+       let to_j ?with_doc l = `List (List.map (w.to_json ?with_doc) l) in
+       let from_j ?def = function
+-      | `List l
+-      | `Tuple l -> List.map (w.from_json ?def: None) l
++      | `List l -> List.map (w.from_json ?def: None) l
+       | `Null -> []
+       | json -> invalid_value json
+       in
+@@ -150,27 +149,24 @@ module Wrapper =
+
+     let pair w1 w2 =
+       let to_j ?with_doc (v1, v2) =
+-        `Tuple [w1.to_json ?with_doc v1 ; w2.to_json ?with_doc v2]
++        `List [w1.to_json ?with_doc v1 ; w2.to_json ?with_doc v2]
+       in
+       let from_j ?def = function
+-        `List [v1 ; v2]
+-      | `Tuple [v1 ; v2] -> (w1.from_json v1, w2.from_json v2)
++      | `List [v1 ; v2] -> (w1.from_json v1, w2.from_json v2)
+       | json -> invalid_value json
+       in
+       make to_j from_j
+
+     let triple w1 w2 w3 =
+       let to_j ?with_doc (v1, v2, v3) =
+-        `Tuple [
++        `List [
+           w1.to_json ?with_doc v1 ;
+           w2.to_json ?with_doc v2 ;
+           w3.to_json ?with_doc v3 ;
+         ]
+       in
+       let from_j ?def = function
+-        `List [v1 ; v2 ; v3]
+-      | `Tuple [v1 ; v2 ; v3] ->
+-          (w1.from_json v1, w2.from_json v2, w3.from_json v3)
++        `List [v1 ; v2 ; v3] -> (w1.from_json v1, w2.from_json v2, w3.from_json v3)
+       | json -> invalid_value json
+       in
+       make to_j from_j
+--
+GitLab
+

pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix

@@ -2,6 +2,7 @@
   lib,
   buildDunePackage,
   fetchFromGitHub,
+  fetchpatch,
   ocaml,
   ppxlib,
   ounit,
@@ -38,7 +39,10 @@ buildDunePackage rec {
   pname = "ppx_deriving_yojson";
   inherit (param) version;
 
-  minimalOCamlVersion = "4.07";
+  patches = fetchpatch {
+    url = "https://github.com/ocaml-ppx/ppx_deriving_yojson/commit/1bbbe2c4c5822c4297b0b812c59a155cf96c5089.patch";
+    hash = "sha256-jYW2/Ix6T94vfI2mGnIkYSG1rjsWEsnOPA1mufP3sd4=";
+  };
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
@@ -54,7 +58,7 @@ buildDunePackage rec {
   ]
   ++ param.propagatedBuildInputs or [ ];
 
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  doCheck = true;
   inherit (param) checkInputs;
 
   meta = {

pkgs/development/ocaml-modules/yojson/default.nix

@@ -5,22 +5,27 @@
   seq,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "yojson";
-  version = "2.2.2";
+  version = "3.0.0";
 
   src = fetchurl {
-    url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";
-    hash = "sha256-mr+tjJp51HI60vZEjmacHmjb/IfMVKG3wGSwyQkSxZU=";
+    url = "https://github.com/ocaml-community/yojson/releases/download/${finalAttrs.version}/yojson-${finalAttrs.version}.tbz";
+    hash =
+      {
+        "3.0.0" = "sha256-mUFNp2CbkqAkdO9LSezaFe3Iy7pSKTQbEk5+RpXDlhA=";
+        "2.2.2" = "sha256-mr+tjJp51HI60vZEjmacHmjb/IfMVKG3wGSwyQkSxZU=";
+      }
+      ."${finalAttrs.version}";
   };
 
-  propagatedBuildInputs = [ seq ];
+  propagatedBuildInputs = lib.optional (!lib.versionAtLeast finalAttrs.version "3.0.0") seq;
 
   meta = {
     description = "Optimized parsing and printing library for the JSON format";
-    homepage = "https://github.com/ocaml-community/${pname}";
+    homepage = "https://github.com/ocaml-community/yojson";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.vbgl ];
     mainProgram = "ydump";
   };
-}
+})

pkgs/development/python-modules/libuuu/default.nix

@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "libuuu";
-  version = "1.5.239";
+  version = "1.5.243";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fknRdLwdB3JCnd6OJzU4jiOWvKgsQJdYkvBgONddaCY=";
+    hash = "sha256-k7DFVrqkHzPLjZMdWyLdfawyOSw+L7Bi4oRdeJo6lxw=";
   };
 
   build-system = [

pkgs/development/python-modules/pysmlight/default.nix

@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pysmlight";
-  version = "0.2.12";
+  version = "0.2.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "smlight-tech";
     repo = "pysmlight";
     tag = "v${version}";
-    hash = "sha256-oTauF58/xeIzcRqxXjdLN3T8cjPz8ZSWvi/XIm8qSsU=";
+    hash = "sha256-59LrSNI9/F7mtlBNILOJIBzqPcX2ivWQR2Cf/otMlzM=";
   };
 
   build-system = [

pkgs/development/rocq-modules/vsrocq-language-server/default.nix

@@ -48,7 +48,6 @@ ocamlPackages.buildDunePackage {
   ++ (with ocamlPackages; [
     findlib
     lablgtk3-sourceview3
-    yojson
     zarith
     ppx_inline_test
     ppx_assert
@@ -56,7 +55,9 @@ ocamlPackages.buildDunePackage {
     ppx_deriving
     ppx_import
     sexplib
-    ppx_yojson_conv
+    (ppx_yojson_conv.override {
+      ppx_yojson_conv_lib = ppx_yojson_conv_lib.override { yojson = yojson_2; };
+    })
     lsp
     sel
     ppx_optcomp

pkgs/development/tools/ocaml/merlin/4.x.nix

@@ -13,6 +13,7 @@
   menhir,
   menhirLib,
   menhirSdk,
+  seq,
   # Each releases of Merlin support a limited range of versions of OCaml.
   version ?
     {
@@ -85,7 +86,8 @@ buildDunePackage {
     (if lib.versionAtLeast version "4.7-414" then merlin-lib else csexp)
     menhirSdk
     menhirLib
-  ];
+  ]
+  ++ lib.optional (!lib.versionAtLeast version "4.7-414") seq;
 
   doCheck = false;
   checkPhase = ''

pkgs/development/tools/ocaml/merlin/default.nix

@@ -9,6 +9,7 @@
   yojson,
   csexp,
   result,
+  seq,
   menhirSdk,
 }:
 
@@ -43,6 +44,7 @@ buildDunePackage rec {
     yojson
     csexp
     result
+    seq
     menhirSdk
   ];
 

pkgs/pkgs-lib/formats.nix

@@ -487,7 +487,10 @@ optionalAttrs allowAliases aliases
     { }:
     json { }
     // {
-      type = mkStructuredType { typeName = "TOML"; };
+      type = mkStructuredType {
+        typeName = "TOML";
+        nullable = false;
+      };
 
       generate =
         name: value:

pkgs/top-level/aliases.nix

@@ -769,6 +769,7 @@ mapAliases {
   jdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
   jdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   jdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
+  jellyfin-media-player = jellyfin-desktop; # Added 2025-12-14
   jesec-rtorrent = throw "'jesec-rtorrent' has been removed due to lack of maintenance upstream."; # Added 2025-11-20
   jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   jing = jing-trang; # Added 2025-09-18

pkgs/top-level/all-packages.nix

@@ -1971,7 +1971,7 @@ with pkgs;
 
   intensity-normalization = with python3Packages; toPythonApplication intensity-normalization;
 
-  jellyfin-media-player = kdePackages.callPackage ../applications/video/jellyfin-media-player { };
+  jellyfin-desktop = kdePackages.callPackage ../applications/video/jellyfin-desktop { };
 
   jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { };
 

pkgs/top-level/ocaml-packages.nix

@@ -422,7 +422,12 @@ let
 
         dolmen_loop = callPackage ../development/ocaml-modules/dolmen/loop.nix { };
 
-        dolmen_lsp = callPackage ../development/ocaml-modules/dolmen/lsp.nix { };
+        dolmen_lsp = callPackage ../development/ocaml-modules/dolmen/lsp.nix {
+          lsp = lsp.override {
+            jsonrpc = jsonrpc.override { yojson = yojson_2; };
+            ppx_yojson_conv_lib = ppx_yojson_conv_lib.override { yojson = yojson_2; };
+          };
+        };
 
         dolmen_model = callPackage ../development/ocaml-modules/dolmen/model.nix { };
 
@@ -1066,7 +1071,11 @@ let
 
         linksem = callPackage ../development/ocaml-modules/linksem { };
 
-        linol = callPackage ../development/ocaml-modules/linol { };
+        linol = callPackage ../development/ocaml-modules/linol {
+          ppx_yojson_conv_lib = ppx_yojson_conv_lib.override {
+            yojson = yojson_2;
+          };
+        };
 
         linol-eio = callPackage ../development/ocaml-modules/linol/eio.nix { };
 
@@ -1316,7 +1325,11 @@ let
           inherit (pkgs.llvmPackages_19) clang libclang libllvm;
         };
 
-        morbig = callPackage ../development/ocaml-modules/morbig { };
+        morbig = callPackage ../development/ocaml-modules/morbig {
+          ppx_deriving_yojson = ppx_deriving_yojson.override {
+            yojson = yojson_2;
+          };
+        };
 
         mparser = callPackage ../development/ocaml-modules/mparser { };
 
@@ -2200,6 +2213,11 @@ let
 
         yojson = callPackage ../development/ocaml-modules/yojson { };
 
+        yojson_2 = yojson.overrideAttrs (_: {
+          version = "2.2.2";
+          __intentionallyOverridingVersion = true;
+        });
+
         yuscii = callPackage ../development/ocaml-modules/yuscii { };
 
         yuujinchou = callPackage ../development/ocaml-modules/yuujinchou { };