Merge master into staging-next

2026-01-06 12:07:29 +00:00
parent fae5cd012b 7648a2676b
commit e8e738de1d
56 changed files with 375 additions and 283 deletions
@@ -1194,7 +1194,7 @@ This is currently implemented by linking to the `env` binary from the `coreutils

 ### binSh {#sssec-pkgs-dockerTools-helpers-binSh}

-This provides a `/bin/sh` link to the `bash` binary from the `bashInteractive` package.
+This provides a `/bin/sh` link to the `bash` binary from the `bash` package.
 Because of this, it supports cases such as running a command interactively in a container (for example by running `docker container run -it <image_name>`).

 ### caCertificates {#sssec-pkgs-dockerTools-helpers-caCertificates}
@@ -1498,7 +1498,7 @@ The environment in the image doesn't match `nix-shell` or `nix-build` exactly, a
  This shell is started when running the image.
  This can be seen as an equivalent of the `NIX_BUILD_SHELL` [environment variable](https://nixos.org/manual/nix/stable/command-ref/nix-shell.html#environment-variables) for {manpage}`nix-shell(1)`.

-  _Default value:_ the `bash` binary from the `bashInteractive` package.
+  _Default value:_ the `bash` binary from the `bash` package.

 `command` (String or Null; _optional_)

@@ -9,6 +9,32 @@
 - Node.js default version has been updated from 22 LTS to 24 LTS.
  This introduces some breaking changes; Refer to the [upstream migration article](https://nodejs.org/en/blog/migrations/v22-to-v24) for details.

+- Nixpkgs configuration, specified for NixOS using `nixpkgs.config`, or using the `config` argument when importing nixpkgs, has learned to accept a `lib` argument as well as `pkgs`, which allows the configuration to be computed without depending on the `pkgs` fixed point.  If you are referencing licenses in `lib.licenses` by having this configuration be a function taking a `pkgs` arg, you may wish to change to using `lib` for faster computation and to avoid infinite recursion errors if pkgs depends on parts of the computed configuration in future.
+
+    For example, if you currently have configuration that looks like this:
+
+        { pkgs, ... }:
+        {
+          allowlistedLicenses = [ pkgs.lib.licenses.nasa13 ];
+          blocklistedLicenses = with pkgs.lib.licenses; [ gpl3Only gpl3Plus ];
+        }
+
+    You may wish to update it to something like this:
+
+        { lib, ... }:
+        {
+          allowlistedLicenses = [ lib.licenses.nasa13 ];
+          blocklistedLicenses = with lib.licenses; [ gpl3Only gpl3Plus ];
+        }
+
+    Or, if you need configuration that works with both 26.05 and 25.11:
+
+        { pkgs, lib ? pkgs.lib, ... }:
+        {
+          allowlistedLicenses = [ lib.licenses.nasa13 ];
+          blocklistedLicenses = with lib.licenses; [ gpl3Only gpl3Plus ];
+        }
+
 ## Backward Incompatibilities {#sec-nixpkgs-release-26.05-incompatibilities}

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -16,8 +16,8 @@ let
  mergeConfig =
    lhs_: rhs_:
    let
-      lhs = optCall lhs_ { inherit pkgs; };
-      rhs = optCall rhs_ { inherit pkgs; };
+      lhs = optCall lhs_ { inherit lib pkgs; };
+      rhs = optCall rhs_ { inherit lib pkgs; };
    in
    lib.recursiveUpdate lhs rhs
    // lib.optionalAttrs (lhs ? packageOverrides) {
@@ -7328,12 +7328,12 @@ final: prev: {

  kulala-nvim = buildVimPlugin {
    pname = "kulala.nvim";
-    version = "5.3.3-unstable-2025-12-25";
+    version = "5.3.3-unstable-2025-12-16";
    src = fetchFromGitHub {
      owner = "mistweaverco";
      repo = "kulala.nvim";
-      rev = "cd3eaa83b8d60533837202dede73238334d71832";
-      hash = "sha256-xyhhvWLF+k+QG7GYOHEdmusZWsHlFg5O3np0a8pT2SU=";
+      rev = "9fc4831a116fb32b0fd420ed483f5102a873446a";
+      hash = "sha256-A5yNW1XLLoSmsT8/7qB+SGguE7IMmcwv6tnhbF6nb2Y=";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
@@ -1591,6 +1591,7 @@ assertNoAdditions {
      dependencies = [ kulala-http-grammar ];
      buildInputs = [ curl ];

+      patches = [ ./patches/kulala-nvim/do-not-install-grammar.patch ];
      postPatch = ''
        substituteInPlace lua/kulala/config/defaults.lua \
          --replace-fail 'curl_path = "curl"' 'curl_path = "${lib.getExe curl}"'
@@ -0,0 +1,15 @@
+diff --git a/lua/kulala/config/init.lua b/lua/kulala/config/init.lua
+index 7298f95..d781a12 100644
+--- a/lua/kulala/config/init.lua
+++ b/lua/kulala/config/init.lua
+@@ -122,6 +122,10 @@ local function setup_treesitter_master()
+ end
+ 
+ local function set_kulala_parser()
+  assert(vim.treesitter.language.add("kulala_http"))
+  vim.treesitter.language.register("kulala_http", { "http", "rest" })
+  do return end
+
+   local parsers = vim.F.npcall(require, "nvim-treesitter.parsers")
+ 
+   if not parsers then
@@ -959,11 +959,11 @@
    "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
  },
  "newrelic_newrelic": {
-    "hash": "sha256-LgFxxOKNONsqIgQulWh9KR4qHamqejAaEhXRV2SZlHA=",
+    "hash": "sha256-60TKPphUfqGJ6FJHEJl7ZSz7FUahDZElSSeHfeDeIOw=",
    "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
    "owner": "newrelic",
    "repo": "terraform-provider-newrelic",
-    "rev": "v3.76.4",
+    "rev": "v3.76.6",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-XkwWyL+1fC5NYiNagCNK15E+QjKU7y2HHbx3feTKxAY="
  },
@@ -1,5 +1,5 @@
 {
-  bashInteractive,
+  bash,
  buildPackages,
  cacert,
  callPackage,
@@ -969,11 +969,11 @@ rec {
    ln -s ${coreutils}/bin/env $out/usr/bin
  '';

-  # This provides /bin/sh, pointing to bashInteractive.
-  # The use of bashInteractive here is intentional to support cases like `docker run -it <image_name>`, so keep these use cases in mind if making any changes to how this works.
+  # This provides /bin/sh, pointing to bash (interactive).
+  # The use of bash (interactive) here is intentional to support cases like `docker run -it <image_name>`, so keep these use cases in mind if making any changes to how this works.
  binSh = runCommand "bin-sh" { } ''
    mkdir -p $out/bin
-    ln -s ${bashInteractive}/bin/bash $out/bin/sh
+    ln -s ${bash}/bin/bash $out/bin/sh
  '';

  # This provides the ca bundle in common locations
@@ -1268,7 +1268,7 @@ rec {
      #
      # https://github.com/NixOS/nix/issues/6379
      homeDirectory ? "/build",
-      shell ? bashInteractive + "/bin/bash",
+      shell ? bash + "/bin/bash",
      command ? null,
      run ? null,
    }:
@@ -90,7 +90,7 @@ rec {
    tag = "latest";
    copyToRoot = pkgs.buildEnv {
      name = "image-root";
-      paths = [ pkgs.bashInteractive ];
+      paths = [ pkgs.bash ];
      pathsToLink = [ "/bin" ];
    };

@@ -549,7 +549,7 @@ rec {
    tag = "latest";
    compressor = "none";
    # Not recommended. Use `buildEnv` between copy and packages to avoid file duplication.
-    copyToRoot = pkgs.bashInteractive;
+    copyToRoot = pkgs.bash;
  };

  bashZstdCompressed = pkgs.dockerTools.buildImage {
@@ -557,20 +557,20 @@ rec {
    tag = "latest";
    compressor = "zstd";
    # Not recommended. Use `buildEnv` between copy and packages to avoid file duplication.
-    copyToRoot = pkgs.bashInteractive;
+    copyToRoot = pkgs.bash;
  };

  # buildImage without explicit tag
  bashNoTag = pkgs.dockerTools.buildImage {
    name = "bash-no-tag";
    # Not recommended. Use `buildEnv` between copy and packages to avoid file duplication.
-    copyToRoot = pkgs.bashInteractive;
+    copyToRoot = pkgs.bash;
  };

  # buildLayeredImage without explicit tag
  bashNoTagLayered = pkgs.dockerTools.buildLayeredImage {
    name = "bash-no-tag-layered";
-    contents = pkgs.bashInteractive;
+    contents = pkgs.bash;
  };

  # buildLayeredImage without compression
@@ -578,7 +578,7 @@ rec {
    name = "bash-layered-uncompressed";
    tag = "latest";
    compressor = "none";
-    contents = pkgs.bashInteractive;
+    contents = pkgs.bash;
  };

  # buildLayeredImage with zstd compression
@@ -586,13 +586,13 @@ rec {
    name = "bash-layered-zstd";
    tag = "latest";
    compressor = "zstd";
-    contents = pkgs.bashInteractive;
+    contents = pkgs.bash;
  };

  # streamLayeredImage without explicit tag
  bashNoTagStreamLayered = pkgs.dockerTools.streamLayeredImage {
    name = "bash-no-tag-stream-layered";
-    contents = pkgs.bashInteractive;
+    contents = pkgs.bash;
  };

  # buildLayeredImage with non-root user
@@ -840,7 +840,7 @@ rec {
    tag = "latest";
    # Not recommended. Use `buildEnv` between copy and packages to avoid file duplication.
    copyToRoot = [
-      pkgs.bashInteractive
+      pkgs.bash
      ./test-dummy
    ];
  };
@@ -849,7 +849,7 @@ rec {
    name = "layered-image-with-path";
    tag = "latest";
    contents = [
-      pkgs.bashInteractive
+      pkgs.bash
      ./test-dummy
    ];
  };
@@ -860,7 +860,7 @@ rec {
    architecture = "arm64";
    # Not recommended. Use `buildEnv` between copy and packages to avoid file duplication.
    copyToRoot = [
-      pkgs.bashInteractive
+      pkgs.bash
      ./test-dummy
    ];
  };
@@ -870,7 +870,7 @@ rec {
    tag = "latest";
    architecture = "arm64";
    contents = [
-      pkgs.bashInteractive
+      pkgs.bash
      ./test-dummy
    ];
  };
@@ -5,7 +5,7 @@
  "packages": {
    "": {
      "dependencies": {
-        "@sourcegraph/amp": "^0.0.1767172180-g2c9ff0"
+        "@sourcegraph/amp": "^0.0.1767672851-gfc2f63"
      }
    },
    "node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@
      }
    },
    "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1767172180-g2c9ff0",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1767172180-g2c9ff0.tgz",
-      "integrity": "sha512-CPLZmfgEh3WiG9LmYEACUHW3UuR3srvW/Bz/L5ORabUUk5cCVfPv8XuU027cPAoDLDN0pVczOLJDudZVOzICEQ==",
+      "version": "0.0.1767672851-gfc2f63",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1767672851-gfc2f63.tgz",
+      "integrity": "sha512-hlr9zHZjcf2RaUGnHwechEee2yxH+KifgszbHyK5mkdYRrk7dAOKMy/jCOJ8LqVFEGaUpqH7f9PAKvvvR1U8ZQ==",
      "license": "Amp Commercial License",
      "dependencies": {
        "@napi-rs/keyring": "1.1.9"
@@ -9,11 +9,11 @@

 buildNpmPackage (finalAttrs: {
  pname = "amp-cli";
-  version = "0.0.1767172180-g2c9ff0";
+  version = "0.0.1767672851-gfc2f63";

  src = fetchzip {
    url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-9GjpmqjGXVY4sWUaLdCvcZandoHTE5KPDfkisNuguSw=";
+    hash = "sha256-o2EgjwaaKnOT6DxxROuZxn3Iso8QPHPr6ecfj9ThttM=";
  };

  postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
    chmod +x bin/amp-wrapper.js
  '';

-  npmDepsHash = "sha256-6eDkFSNKDU2eC5FOStVXqt0rLqN6k7r1+s+lDTEf5xw=";
+  npmDepsHash = "sha256-PWVsz7QiiQHBiuizEXa2yovBIc3T7kz+SaznRLL0Miw=";

  propagatedBuildInputs = [
    ripgrep
@@ -11,7 +11,15 @@
  versionCheckHook,
 }:

-python3Packages.buildPythonApplication rec {
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      lsprotocol = self.lsprotocol_2023;
+      pygls = self.pygls_1;
+    }
+  );
+in
+pythonPackages.buildPythonApplication rec {
  pname = "cmake-language-server";
  version = "0.1.11";
  pyproject = true;
@@ -31,12 +39,12 @@ python3Packages.buildPythonApplication rec {
        "CALL_TIMEOUT = 10"
  '';

-  build-system = with python3Packages; [
+  build-system = with pythonPackages; [
    pdm-backend
  ];
  dontUseCmakeConfigure = true;

-  dependencies = with python3Packages; [
+  dependencies = with pythonPackages; [
    pygls
  ];

@@ -47,7 +55,7 @@ python3Packages.buildPythonApplication rec {
    cmake-format
    versionCheckHook
  ]
-  ++ (with python3Packages; [
+  ++ (with pythonPackages; [
    pytest-datadir
    pytestCheckHook
  ]);
@@ -8,17 +8,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "codebook";
-  version = "0.3.22";
+  version = "0.3.23";

  src = fetchFromGitHub {
    owner = "blopker";
    repo = "codebook";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Sym8526IErPFIoQK22rSioZzw3vmWuceG6zXyL/FZpo=";
+    hash = "sha256-msd0y6+MXyrcJ7F5X8LP23Q/VcVSeO8VRqCJlidhkqo=";
  };

  buildAndTestSubdir = "crates/codebook-lsp";
-  cargoHash = "sha256-KopjcsBH/OWnyHen5HS1MKPNzuxit2BqjXTh1bH6lhI=";
+  cargoHash = "sha256-NoqF1qos9/0aNhisrHupQBvR0Vxpng9o5xBgoSOWlr4=";

  CARGO_PROFILE_RELEASE_LTO = "fat";
  CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1";
@@ -12,13 +12,13 @@
  inherit hamlibSupport gpsdSupport extraScripts;
 }).overrideAttrs
  (oldAttrs: {
-    version = "1.8.1-unstable-2025-12-28";
+    version = "1.8.1-unstable-2026-01-03";

    src = fetchFromGitHub {
      owner = "wb2osz";
      repo = "direwolf";
-      rev = "01c31145716fd57e2e53844718bdc769dcce16dd";
-      hash = "sha256-OxNhSrxshbdCCNkwnYzz/1NNYwNJYAQiQ7iaXw3x7kc=";
+      rev = "9aba4b386f841e5c9c9068a2259f7f5058a5dee5";
+      hash = "sha256-MHzPwx4N+LLETEZMQz4hmM+1qbwNJjHSISvTWROg+3o=";
    };

    # drop upstreamed cmake-4 patch
@@ -6,15 +6,15 @@
 }:
 buildGoModule rec {
  pname = "double-entry-generator";
-  version = "2.12.0";
+  version = "2.14.0";
  src = fetchFromGitHub {
    owner = "deb-sig";
    repo = "double-entry-generator";
-    hash = "sha256-j/iShGFfuk4iIGFv+S5sxXCyJ2f0xbJVYOSFtsijjq0=";
+    hash = "sha256-gKgk9H0p17Pv+giV+vz4cdU99EQ3AhY+WC8Weu+XPPQ=";
    rev = "v${version}";
  };

-  vendorHash = "sha256-CJ+mfH9qJXYhicxrL9+i8H6CVKZua40D1/Sg3vWQs68=";
+  vendorHash = "sha256-aOzqxXGBjrIZcE0GfnPC3B3GrbSUgkvimkzLTcthspM=";

  excludedPackages = [ "hack" ];

@@ -28,7 +28,7 @@
  spirv-cross,
  udev,
  libbacktrace,
-  ffmpeg_8-headless,
+  ffmpeg-headless,
  cubeb,
  fetchurl,
  zip,
@@ -61,14 +61,14 @@ let

  linuxDrv = llvmPackages.stdenv.mkDerivation (finalAttrs: {
    pname = "duckstation";
-    version = "0.1-10339";
+    version = "0.1-10413";

    src = fetchFromGitHub {
      owner = "stenzek";
      repo = "duckstation";
      tag = "v${finalAttrs.version}";
      deepClone = true;
-      hash = "sha256-U/RYyXazuu5qTMC+q4r8oGJN0vMaVBONRk0STcSJl9A=";
+      hash = "sha256-ytJ0vaXXbbgSmZ42gQPlQY7p30hz7hx/+09TSvCKyEg=";

      postFetch = ''
        cd $out
@@ -255,7 +255,7 @@ let
      qt6.qtbase
      udev
      libbacktrace
-      ffmpeg_8-headless
+      ffmpeg-headless
      cubeb
    ]
    ++ [
@@ -270,12 +270,12 @@ let
      mkdir -p $out/{lib,bin,share/{applications,icons/hicolor/512x512/apps}}
      cp -r bin $out/lib/duckstation
      ln -s $out/lib/duckstation/duckstation-qt $out/bin/duckstation-qt
-      ln -s $out/lib/duckstation/resources/org.duckstation.DuckStation.desktop \
-            $out/share/applications
-      ln -s $out/lib/duckstation/resources/org.duckstation.DuckStation.png \
-            $out/share/icons/hicolor/512x512/apps

      pushd ..
+      install -Dm644 scripts/packaging/org.duckstation.DuckStation.desktop \
+        -t $out/share/applications
+      install -Dm644 scripts/packaging/org.duckstation.DuckStation.png \
+        -t $out/share/icons/hicolor/512x512/apps
      install -Dm644 LICENSE -t $out/share/doc/duckstation
      install -Dm644 README.* -t $out/share/doc/duckstation
      install -Dm644 CONTRIBUTORS.md -t $out/share/doc/duckstation
@@ -287,7 +287,7 @@ let
    qtWrapperArgs = [
      "--prefix LD_LIBRARY_PATH : ${
        (lib.makeLibraryPath [
-          ffmpeg_8-headless
+          ffmpeg-headless
          finalAttrs.vendorShaderc
        ])
      }"
@@ -1,7 +1,7 @@
 {
  "duckstation": {
-    "version": "0.1-10339",
-    "hash_darwin": "sha256-azs9Bqba2ymAQkGDtHOHFcCVUZAEo/0VcnHn6Gx/KXo="
+    "version": "0.1-10413",
+    "hash_darwin": "sha256-TGXLpbTFkrFQ42LpRx0TKBsbdIRuYtseR+v3W/t9M10="
  },
  "discord_rpc": {
    "rev": "cc59d26d1d628fbd6527aac0ac1d6301f4978b92",
@@ -12,8 +12,8 @@
    "hash": "sha256-7PVrpS69pI5mi4aM1eNTAzZCMq6vuVl3mhTrc4U942w="
  },
  "chtdb": {
-    "date": "2025-12-05",
-    "rev": "df56dfb2f74e0d2a8274a072d8566cf347a723b4",
-    "hash": "sha256-sIC76+19NAA7ycDEaj6przGEyqTny7c9JIh3523rBMY="
+    "date": "2025-12-31",
+    "rev": "696e985e027d8d43a84c65bd349802dfe0944674",
+    "hash": "sha256-4t0x0YYp7rURBqVWyMZpnOATpIYoILQagyMASaSWKWM="
  }
 }
@@ -7,18 +7,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "emmylua_ls";
-  version = "0.18.0";
+  version = "0.19.0";

  src = fetchFromGitHub {
    owner = "EmmyLuaLs";
    repo = "emmylua-analyzer-rust";
    tag = finalAttrs.version;
-    hash = "sha256-JXe+I0CViJAXOnWzilYpjWquYFzZGIP5y6HS6KosYPU=";
+    hash = "sha256-bdvJInMuWJq7MZa+4wrKBn0myLTHCayhDAhB8Stjp6A=";
  };

  buildAndTestSubdir = "crates/emmylua_ls";

-  cargoHash = "sha256-UVuXeGmSvAwHs/U0s/mByiZCwa2refz1l8eJvcCoagk=";
+  cargoHash = "sha256-bF6bdTbcHDecj+wVoNsaKBzsz96d3vo6cqp5MjSbT4E=";

  nativeInstallCheckInputs = [
    versionCheckHook
@@ -39,13 +39,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
  pname = "koboldcpp";
-  version = "1.104";
+  version = "1.105.3";

  src = fetchFromGitHub {
    owner = "LostRuins";
    repo = "koboldcpp";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-dhOdmyy+mhV2O/eWw3pNZefqRuhtakdD7iAG/RWOCEg=";
+    hash = "sha256-8PgliEwe9ETFmdqHZdmbApz2uxhLLV/fcC2p/N8rOkY=";
  };

  enableParallelBuilding = true;
@@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "koto";
-  version = "0.16.0";
+  version = "0.16.1";

  src = fetchFromGitHub {
    owner = "koto-lang";
    repo = "koto";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-KdwKJ0ZKKHU+Fe/TTIITHOyRH9uoJ3LU3qXqUwpJI6g=";
+    hash = "sha256-47eDSohLH/cMmMwjUENNeT5danpgMKLPEMzEUACrpiY=";
  };

-  cargoHash = "sha256-5uWCpTnGbqoogOxSD2GcXMjQpoYIp1GfB9k4bd+Easc=";
+  cargoHash = "sha256-mQxPwU/f7/AastJmGBZOAxGKaZBWTQUkb2KIuC6MSfE=";

  postPatch = ''
    tomlq -ti 'del(.bench)' crates/koto/Cargo.toml
@@ -8,11 +8,11 @@

 let
  pname = "ledger-live-desktop";
-  version = "2.133.0";
+  version = "2.135.1";

  src = fetchurl {
    url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-2oyfqeNRYfl/UogFwQ+qKjmNJbdyQAF6/AlErOLw0hg=";
+    hash = "sha256-M57ah+15L30r30AI40K1qzeUbYch/TpwkTu88vvzUK0=";
  };

  appimageContents = appimageTools.extractType2 {
@@ -18,11 +18,11 @@

 stdenv.mkDerivation rec {
  pname = "libtracefs";
-  version = "1.8.2";
+  version = "1.8.3";

  src = fetchzip {
    url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-libtracefs-${version}.tar.gz";
-    hash = "sha256-rpZUa34HMnDMSsGGwtOriEEHDfnW8emRSHZxzRkY3c4=";
+    hash = "sha256-uN4alsOmj7IFUL2IJSHbgBiztv2Sq0+MktQiRByvhK0=";
  };

  postPatch = ''
@@ -6,7 +6,15 @@
  nix-update-script,
 }:

-python3Packages.buildPythonApplication rec {
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      lsprotocol = self.lsprotocol_2023;
+      pygls = self.pygls_1;
+    }
+  );
+in
+pythonPackages.buildPythonApplication rec {
  pname = "nginx-language-server";
  version = "0.9.0";
  pyproject = true;
@@ -18,7 +26,7 @@ python3Packages.buildPythonApplication rec {
    hash = "sha256-v9+Y8NBvN8HvTdNrK9D9YQuqDB3olIu5LfYapjlVlAM=";
  };

-  build-system = with python3Packages; [
+  build-system = with pythonPackages; [
    poetry-core
  ];

@@ -26,7 +34,7 @@ python3Packages.buildPythonApplication rec {
    "pydantic"
  ];

-  dependencies = with python3Packages; [
+  dependencies = with pythonPackages; [
    crossplane
    lsprotocol
    pydantic
@@ -24,13 +24,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "openimageio";
-  version = "3.1.7.0";
+  version = "3.1.9.0";

  src = fetchFromGitHub {
    owner = "AcademySoftwareFoundation";
    repo = "OpenImageIO";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-7yZez5oXeAghwhi/AFaPjCuwwIsMrPJzc8k/oR4v19Y=";
+    hash = "sha256-0XN/Bcmpi3jUBtgvTlcqXLFuMS51UrzbpZ+eAb7QPRI=";
  };

  outputs = [
@@ -11,18 +11,18 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "openlist-frontend";
-  version = "4.1.8";
+  version = "4.1.9";

  src = fetchFromGitHub {
    owner = "OpenListTeam";
    repo = "OpenList-Frontend";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-TzRqMyKDTuqFohMqoBAPkLrJ/eYveHYocsxo8WuNUWY=";
+    hash = "sha256-ckReBZleNNd2dlTxtlPaJ6R2YesD2NH7n8w4nk4uGaQ=";
  };

  i18n = fetchzip {
    url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz";
-    hash = "sha256-8b3u0yezYCYLyKPTM/QRXArqhbRC1foT3bFoNhsdYiw=";
+    hash = "sha256-qci63KIKVQiSk7XAsXyNQZNqnGpRcYtt5Yqkzpv7kX4=";
    stripRoot = false;
  };

@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    inherit (finalAttrs) pname version src;
    pnpm = pnpm_9;
    fetcherVersion = 2;
-    hash = "sha256-bPI8g7wN9k1fBzj+F9wRDw7XPGT6DKDllbyOmUKi7HY=";
+    hash = "sha256-Loq+ZsVWHIn/rc8dc7PCvFL/wcZG0aD1lOcI9/tu1h8=";
  };

  buildPhase = ''
@@ -11,13 +11,13 @@

 buildGoModule (finalAttrs: {
  pname = "openlist";
-  version = "4.1.8";
+  version = "4.1.9";

  src = fetchFromGitHub {
    owner = "OpenListTeam";
    repo = "OpenList";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-R3R5DfI+lctpFh68z9zsNhNc3siVIOj02lclYIYElzg=";
+    hash = "sha256-f9D/TRo7xu0KAfTp49ScKREjN6gljhE6GvFiF85ngjQ=";
    # populate values that require us to use git. By doing this in postFetch we
    # can delete .git afterwards and maintain better reproducibility of the src.
    leaveDotGit = true;
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
  frontend = callPackage ./frontend.nix { };

  proxyVendor = true;
-  vendorHash = "sha256-Kx553w93A6nCBJTejY2TEUQhfYiByivMAfcVsWa1z6U=";
+  vendorHash = "sha256-ySadNv+H/3/x+iUA5I3AyI2Ht5+Vn8AB2exDTudlKHE=";

  buildInputs = [ fuse ];

@@ -6,7 +6,15 @@
  pandoc,
 }:

-python3Packages.buildPythonApplication rec {
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      lsprotocol = self.lsprotocol_2023;
+      pygls = self.pygls_1;
+    }
+  );
+in
+pythonPackages.buildPythonApplication rec {
  pname = "systemd-language-server";
  version = "0.3.5";
  pyproject = true;
@@ -18,14 +26,14 @@ python3Packages.buildPythonApplication rec {
    hash = "sha256-QRd2mV4qRh4OfVJ2/5cOm3Wh8ydsLTG9Twp346DHjs0=";
  };

-  build-system = with python3Packages; [
+  build-system = with pythonPackages; [
    poetry-core
  ];

  pythonRelaxDeps = [
    "lxml"
  ];
-  dependencies = with python3Packages; [
+  dependencies = with pythonPackages; [
    lxml
    pygls
  ];
@@ -34,7 +42,7 @@ python3Packages.buildPythonApplication rec {

  nativeCheckInputs = [
    pandoc
-    python3Packages.pytestCheckHook
+    pythonPackages.pytestCheckHook
  ];

  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
@@ -6,7 +6,15 @@
  versionCheckHook,
 }:

-python3Packages.buildPythonApplication rec {
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      lsprotocol = self.lsprotocol_2023;
+      pygls = self.pygls_1;
+    }
+  );
+in
+pythonPackages.buildPythonApplication rec {
  pname = "tclint";
  version = "0.7.0";
  pyproject = true;
@@ -18,7 +26,7 @@ python3Packages.buildPythonApplication rec {
    hash = "sha256-GkWQlOmPh/IpkdcNKkaHJoVDD2r5wCSFeMZA96dxiXM=";
  };

-  build-system = with python3Packages; [
+  build-system = with pythonPackages; [
    setuptools
    setuptools-scm
  ];
@@ -27,12 +35,12 @@ python3Packages.buildPythonApplication rec {
    "importlib-metadata"
    "pathspec"
  ];
-  dependencies = with python3Packages; [
+  dependencies = with pythonPackages; [
    importlib-metadata
    pathspec
    ply
-    pygls_1
-    lsprotocol_2023
+    pygls
+    lsprotocol
    tomli
    voluptuous
  ];
@@ -41,7 +49,7 @@ python3Packages.buildPythonApplication rec {

  nativeCheckInputs = [
    addBinToPathHook
-    python3Packages.pytestCheckHook
+    pythonPackages.pytestCheckHook
    versionCheckHook
  ];
  versionCheckProgramArg = "--version";
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "turso";
-  version = "0.3.2";
+  version = "0.4.0";

  src = fetchFromGitHub {
    owner = "tursodatabase";
    repo = "turso";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-biElXD4d6h28Nq7LIjuL+at/y69TxnsJzvnEX8cOM9E=";
+    hash = "sha256-94ow9LUouifdE3ml2iyo72Y0nQSSLfnU5qnNHiJHqKw=";
  };

-  cargoHash = "sha256-G2VowcxnCRulQ4pJcpfJbH73vkG+KIteeUF1Hq8TEZg=";
+  cargoHash = "sha256-c6PIrbRclU/l7wuhOIANBgCnRu2Y/UoUeZA/eg13KoA=";

  cargoBuildFlags = [
    "-p"
@@ -12,16 +12,16 @@

 buildGoModule rec {
  pname = "updatecli";
-  version = "0.111.0";
+  version = "0.112.0";

  src = fetchFromGitHub {
    owner = "updatecli";
    repo = "updatecli";
    rev = "v${version}";
-    hash = "sha256-ohsb8gObY25c5kkUaDWAd2VKfOUQ6/xwjPPyCeqxuRA=";
+    hash = "sha256-goJH+B6gPNHSQmeUvXUVq5HBwMAKaGZiTlwiZK7rkbg=";
  };

-  vendorHash = "sha256-Io4+4CE+Rb7XD7Q/JSbzXcG7nXXXSNFE8OCCLlqt8Ek=";
+  vendorHash = "sha256-8NrT1jzLd1/8IFm8lOlqwQcSiaYQMRato7Z0kZFuN1s=";

  # tests require network access
  doCheck = false;
@@ -18,7 +18,7 @@ let
 in
 python3Packages.buildPythonApplication rec {
  pname = "upsies";
-  version = "2025.12.22";
+  version = "2026.01.03";
  pyproject = true;

  src = fetchFromGitea {
@@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
    owner = "plotski";
    repo = "upsies";
    tag = "v${version}";
-    hash = "sha256-wVQleIpPZHlb4FFyteaEvHu6M3WuuOXZ0ChqqlABJsQ=";
+    hash = "sha256-Ya1v0DR5a4fPsFVJKVSDbgy+hWE136aRV3pFMExlRhU=";
  };

  patches = [
@@ -91,6 +91,8 @@ let
          "chromadb/test/db/test_migrations.py::test_migrations[sqlite]"
        ];
      });
+      lsprotocol = self.lsprotocol_2023;
+      pygls = self.pygls_1;
    };
  };
 in
@@ -2,27 +2,27 @@
  lib,
  fetchFromGitHub,
  rustPlatform,
+  versionCheckHook,
 }:

-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "versatiles";
-  version = "2.0.1"; # When updating: Replace with current version
+  version = "3.1.0";

  src = fetchFromGitHub {
    owner = "versatiles-org";
    repo = "versatiles-rs";
-    tag = "v${version}"; # When updating: Replace with long commit hash of new version
-    hash = "sha256-qFVqikq1T6LQnOWgM66uKzFhWQbVjEuUK3N5vNvaDq4="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-U9Os5HiehujU+/O2ZeUEtBJCVOBOi4dfH89Y9d0+RlI=";
  };

-  cargoHash = "sha256-kkYdQEBydxPwxxSjTiwk4huCDK3xJ9FoyrcHL88ytfk="; # When updating: Same as above
+  cargoHash = "sha256-p2ezrYhAxGvxzI3Q8BA0nGWwzim3L3AdIdf+8oMquSA=";

  __darwinAllowLocalNetworking = true;

-  # Testing only necessary for the `bins` and `lib` features
+  # Testing only necessary for `bins`
  cargoTestFlags = [
    "--bins"
-    "--lib"
  ];

  # Skip tests that require network access
@@ -30,6 +30,7 @@ rustPlatform.buildRustPackage rec {
    "--skip=tools::convert::tests::test_remote1"
    "--skip=tools::convert::tests::test_remote2"
    "--skip=tools::probe::tests::test_remote"
+    "--skip=tools::serve::tests::test_config"
    "--skip=tools::serve::tests::test_remote"
    "--skip=utils::io::data_reader_http"
    "--skip=utils::io::data_reader_http::tests::read_range_git"
@@ -38,6 +39,12 @@ rustPlatform.buildRustPackage rec {
    "--skip=io::data_reader_http::tests::read_range_googleapis"
  ];

+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
  meta = {
    description = "Toolbox for converting, checking and serving map tiles in various formats";
    longDescription = ''
@@ -46,10 +53,10 @@ rustPlatform.buildRustPackage rec {
    '';
    homepage = "https://versatiles.org/";
    downloadPage = "https://github.com/versatiles-org/versatiles-rs";
-    changelog = "https://github.com/versatiles-org/versatiles-rs/releases/tag/v${version}";
+    changelog = "https://github.com/versatiles-org/versatiles-rs/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ wilhelmines ];
    mainProgram = "versatiles";
    platforms = with lib.platforms; linux ++ darwin ++ windows;
  };
-}
+})
@@ -7,13 +7,13 @@

 buildGoModule (finalAttrs: {
  pname = "yamlfmt";
-  version = "0.20.0";
+  version = "0.21.0";

  src = fetchFromGitHub {
    owner = "google";
    repo = "yamlfmt";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-KMIkll7seKslvb4ErelpKxWg/T2P9FLYKfTyAEWlbWk=";
+    hash = "sha256-tiPTTAPqXp8ptEKsAII3sTiMCneiWEXg4pl2F1Nb+8A=";
    leaveDotGit = true;
    postFetch = ''
      git -C "$out" rev-parse --short HEAD > "$out/.git_head"
@@ -21,7 +21,7 @@ buildGoModule (finalAttrs: {
    '';
  };

-  vendorHash = "sha256-Cy1eBvKkQ90twxjRL2bHTk1qNFLQ22uFrOgHKmnoUIQ=";
+  vendorHash = "sha256-UTfbfAjmWKrHr/YxaWuaFswF3EnqcE8Otnz/sPoYT5w=";

  ldflags = [
    "-s"
@@ -358,13 +358,13 @@

 buildPythonPackage rec {
  pname = "boto3-stubs";
-  version = "1.42.21";
+  version = "1.42.22";
  pyproject = true;

  src = fetchPypi {
    pname = "boto3_stubs";
    inherit version;
-    hash = "sha256-3ngHCBAQs3aLcxJyk2/n1KTUzfjd4ZaQ1GHhTnPiLWM=";
+    hash = "sha256-jPNMLFuZ2/UfSKpIaB9SqY38o4LGQp87nNcnxpsYXyo=";
  };

  build-system = [ setuptools ];
@@ -9,13 +9,13 @@

 buildPythonPackage rec {
  pname = "botocore-stubs";
-  version = "1.42.21";
+  version = "1.42.22";
  pyproject = true;

  src = fetchPypi {
    pname = "botocore_stubs";
    inherit version;
-    hash = "sha256-uCLIXoYW32bbMg1S2hLqESAWxlSPjAfH5UZSSsVc/0s=";
+    hash = "sha256-4NxZwBTMtYlvrCXNy0z7c3DQLgh3yxWUnE/Wmmd0o1g=";
  };

  nativeBuildInputs = [ setuptools ];
@@ -4,6 +4,7 @@
  buildPythonPackage,
  fetchFromGitHub,
  fetchurl,
+  pythonAtLeast,

  # build inputs
  cargo,
@@ -77,6 +78,9 @@ buildPythonPackage rec {
    hash = "sha256-1saQEMaGuhXT+3bSlxl7yCXYptsOiYh3Uyn4Izn5Q4M=";
  };

+  # https://github.com/chroma-core/chroma/issues/5996
+  disabled = pythonAtLeast "3.14";
+
  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit pname version src;
    hash = "sha256-zqE3NhTYrHol5Y6/CRMPQeq43Wo+ofic9SrMLqyJJPs=";
@@ -1,36 +1,34 @@
 {
  lib,
  buildPythonPackage,
-  fetchPypi,
-  pytest,
  click,
-  isPy3k,
-  futures ? null,
+  fetchPypi,
+  pytestCheckHook,
+  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "click-threading";
  version = "0.5.0";
-  format = "setuptools";
+  pyproject = true;

  src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
    hash = "sha256-rc/mI8AqWVwQfDFAcvZ6Inj+TrQLcsDRoskDzHivNDk=";
  };

-  nativeCheckInputs = [ pytest ];
-  propagatedBuildInputs = [ click ] ++ lib.optional (!isPy3k) futures;
+  build-system = [ setuptools ];

-  checkPhase = ''
-    py.test
-  '';
+  dependencies = [ click ];

-  # Tests are broken on 3.x
-  doCheck = !isPy3k;
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "click_threading" ];

  meta = {
-    homepage = "https://github.com/click-contrib/click-threading/";
    description = "Multithreaded Click apps made easy";
+    homepage = "https://github.com/click-contrib/click-threading/";
    license = lib.licenses.mit;
+    maintainers = [ ];
  };
-}
+})
@@ -1,8 +1,7 @@
 {
  lib,
-  async-timeout,
-  buildPythonPackage,
  base36,
+  buildPythonPackage,
  chacha20poly1305-reuseable,
  cryptography,
  fetchFromGitHub,
@@ -12,12 +11,13 @@
  pytest-asyncio,
  pytest-timeout,
  pytestCheckHook,
+  pythonAtLeast,
  pythonOlder,
  setuptools,
  zeroconf,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "hap-python";
  version = "5.0.0";
  pyproject = true;
@@ -25,7 +25,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "ikalchev";
    repo = "HAP-python";
-    tag = version;
+    tag = finalAttrs.version;
    hash = "sha256-+EhxoO5X/ANGh008WE0sJeBsu8SRnuds3hXGxNWpKnk=";
  };

@@ -37,9 +37,6 @@ buildPythonPackage rec {
    h11
    orjson
    zeroconf
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [
-    async-timeout
  ];

  optional-dependencies.QRCode = [
@@ -52,15 +49,20 @@ buildPythonPackage rec {
    pytest-timeout
    pytestCheckHook
  ]
-  ++ optional-dependencies.QRCode;
+  ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);

  pythonImportsCheck = [ "pyhap" ];

+  disabledTests = lib.optionals (pythonAtLeast "3.14") [
+    # https://github.com/ikalchev/HAP-python/issues/490
+    "test_start_from_sync"
+  ];
+
  meta = {
    description = "HomeKit Accessory Protocol implementation";
    homepage = "https://github.com/ikalchev/HAP-python";
-    changelog = "https://github.com/ikalchev/HAP-python/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/ikalchev/HAP-python/blob/${finalAttrs.src.tag}/CHANGELOG.md";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ oro ];
  };
-}
+})
@@ -8,14 +8,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "iamdata";
-  version = "0.1.202601051";
+  version = "0.1.202601061";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "cloud-copilot";
    repo = "iam-data-python";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-zCFUaPVocCvFH3eWdfufWHDsgN/ewW/hKoS9D/XnInU=";
+    hash = "sha256-h3+HGFHpmc5nIf/8tFm2xNiismIF3l7Hbzdvz6trvDI=";
  };

  __darwinAllowLocalNetworking = true;
@@ -11,9 +11,9 @@
  # dependencies
  docstring-to-markdown,
  jedi,
-  lsprotocol_2025,
+  lsprotocol,
  cattrs,
-  pygls_2,
+  pygls,

  # tests
  pytestCheckHook,
@@ -43,9 +43,9 @@ buildPythonPackage rec {
  dependencies = [
    docstring-to-markdown
    jedi
-    lsprotocol_2025
+    lsprotocol
    cattrs
-    pygls_2
+    pygls
  ];

  nativeCheckInputs = [
@@ -7,7 +7,7 @@
  colorama,
  jinja2,
  jsonschema,
-  pygls_2,
+  pygls,
  tree-sitter,
  pytestCheckHook,
 }:
@@ -33,7 +33,7 @@ buildPythonPackage rec {
    colorama
    jinja2
    jsonschema
-    pygls_2
+    pygls
    tree-sitter
  ];
  nativeCheckInputs = [ pytestCheckHook ];
@@ -8,21 +8,18 @@
  fetchFromGitHub,
  gcc,
  pytestCheckHook,
-  pythonOlder,
  setuptools,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "primer3";
  version = "2.2.0";
  pyproject = true;

-  disabled = pythonOlder "3.7";
-
  src = fetchFromGitHub {
    owner = "libnano";
    repo = "primer3-py";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-GrVYYjS/+LZScZETfk7YcSy2yrWc3SPumXvyQeEpFUg=";
  };

@@ -37,6 +34,7 @@ buildPythonPackage rec {
    click
    pytestCheckHook
  ];
+
  # We are not sure why exactly this is need. It seems `pytestCheckHook`
  # doesn't find extension modules installed in $out/${python.sitePackages},
  # and the tests rely upon them. This was initially reported upstream at
@@ -51,8 +49,8 @@ buildPythonPackage rec {
  meta = {
    description = "Oligo analysis and primer design";
    homepage = "https://github.com/libnano/primer3-py";
-    changelog = "https://github.com/libnano/primer3-py/blob/${src.tag}/CHANGES";
+    changelog = "https://github.com/libnano/primer3-py/blob/${finalAttrs.src.tag}/CHANGES";
    license = lib.licenses.gpl2Only;
    maintainers = with lib.maintainers; [ fab ];
  };
-}
+})
@@ -62,6 +62,7 @@ buildPythonPackage rec {
  passthru.skipBulkUpdate = true;

  meta = {
+    broken = lib.versionAtLeast lsprotocol.version "2024";
    description = "Pythonic generic implementation of the Language Server Protocol";
    homepage = "https://github.com/openlawlibrary/pygls";
    changelog = "https://github.com/openlawlibrary/pygls/blob/${version}/CHANGELOG.md";
@@ -3,7 +3,7 @@
  fetchPypi,
  buildPythonPackage,
  hatchling,
-  pygls_2,
+  pygls,
  pytestCheckHook,
  pytest-asyncio,
  packaging,
@@ -25,7 +25,7 @@ buildPythonPackage rec {
  ];

  dependencies = [
-    pygls_2
+    pygls
    pytest-asyncio
    packaging
  ];
@@ -21,16 +21,16 @@
  pytest-timeout,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "timm";
-  version = "1.0.22";
+  version = "1.0.23";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "huggingface";
    repo = "pytorch-image-models";
-    tag = "v${version}";
-    hash = "sha256-ilOnC1tqSb4TuSGRafMNl8hi9P2qdsBWbv3G9azy6Gs=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-TOIg5/ddkAvFqqpnq/P0yURb/1wF2bgyQ0Odzc9WPEc=";
  };

  build-system = [ pdm-backend ];
@@ -55,6 +55,9 @@ buildPythonPackage rec {
    lib.optionals (pythonAtLeast "3.14") [
      # RuntimeError: torch.compile is not supported on Python 3.14+
      "test_kron"
+
+      # AttributeError: 'LsePlus2d' object has no attribute '__annotations__'. Did you mean: '__annotate_func__'?
+      "test_torchscript"
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised:
@@ -76,8 +79,8 @@ buildPythonPackage rec {
  meta = {
    description = "PyTorch image models, scripts, and pretrained weights";
    homepage = "https://huggingface.co/docs/timm/index";
-    changelog = "https://github.com/huggingface/pytorch-image-models/blob/v${version}/README.md#whats-new";
+    changelog = "https://github.com/huggingface/pytorch-image-models/blob/${finalAttrs.src.tag}/README.md#whats-new";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ bcdarwin ];
  };
-}
+})
@@ -3,8 +3,8 @@
  attrs,
  buildPythonPackage,
  cattrs,
-  click,
  click-option-group,
+  click,
  fetchPypi,
  hatch-vcs,
  hatchling,
@@ -13,6 +13,8 @@
  pydantic,
  pytest-cov-stub,
  pytestCheckHook,
+  python-dotenv,
+  pythonAtLeast,
  pythonOlder,
  rich-click,
  sybil,
@@ -21,15 +23,15 @@
 }:
 buildPythonPackage rec {
  pname = "typed-settings";
-  version = "25.0.0";
+  version = "25.3.0";
  pyproject = true;

-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.10";

  src = fetchPypi {
    pname = "typed_settings";
    inherit version;
-    hash = "sha256-Kbr9Mc1PXgD+OAw/ADp3HXC+rnAJcFEqjlXxQq/1wRM=";
+    hash = "sha256-hl61LDGE9GdwVkWh5Y251xngi515V0SKKtjLvCLtIaY=";
  };

  build-system = [ hatchling ];
@@ -62,6 +64,7 @@ buildPythonPackage rec {
    hypothesis
    pytest-cov-stub
    pytestCheckHook
+    python-dotenv
    rich-click
    sybil
  ]
@@ -79,6 +82,10 @@ buildPythonPackage rec {
  disabledTestPaths = [
    # 1Password CLI is not available
    "tests/test_onepassword.py"
+  ]
+  ++ lib.optionals (pythonAtLeast "3.14") [
+    # All the CLI help messages begin with python3.14 instead of python3
+    "tests/test_cli_argparse.py"
  ];

  pythonImportsCheck = [ "typed_settings" ];
@@ -17,7 +17,7 @@
  usort,

  # optional-dependencies
-  pygls_2,
+  pygls,
  ruff-api,

  # tests
@@ -51,7 +51,7 @@ buildPythonPackage rec {
  ];

  optional-dependencies = {
-    lsp = [ pygls_2 ];
+    lsp = [ pygls ];
    ruff = [ ruff-api ];
  };

@@ -30,7 +30,7 @@
  writableTmpDirAsHomeHook,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "weasyprint";
  version = "66.0";
  pyproject = true;
@@ -40,7 +40,7 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "Kozea";
    repo = "WeasyPrint";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-wmEDVEbikBpOQ5394IBPWQRjWZOLfMzEGxTtq4tt2Tw=";
  };

@@ -97,21 +97,23 @@ buildPythonPackage rec {
    "test_visibility_3"
    "test_visibility_4"
    "test_woff_simple"
+    # AssertionError
+    "test_2d_transform"
  ];

  FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";

  # Set env variable explicitly for Darwin, but allow overriding when invoking directly
-  makeWrapperArgs = [ "--set-default FONTCONFIG_FILE ${FONTCONFIG_FILE}" ];
+  makeWrapperArgs = [ "--set-default FONTCONFIG_FILE ${finalAttrs.FONTCONFIG_FILE}" ];

  pythonImportsCheck = [ "weasyprint" ];

  meta = {
-    changelog = "https://github.com/Kozea/WeasyPrint/releases/tag/${src.tag}";
+    changelog = "https://github.com/Kozea/WeasyPrint/releases/tag/${finalAttrs.src.tag}";
    description = "Converts web documents to PDF";
-    mainProgram = "weasyprint";
    homepage = "https://weasyprint.org/";
    license = lib.licenses.bsd3;
+    mainProgram = "weasyprint";
    teams = [ lib.teams.apm ];
  };
-}
+})
@@ -20,9 +20,9 @@
    ]
  },
  "calendar": {
-    "hash": "sha256-GcoHXCAsyoWyXT5/55+Eu/G1D4pZe2A8iR1wRo9S/9s=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.5.9/calendar-v5.5.9.tar.gz",
-    "version": "5.5.9",
+    "hash": "sha256-BkbbhQ3hsVhFa1gE7OYSu5CH0JjmNJGFe6NEZ5fit10=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.5.11/calendar-v5.5.11.tar.gz",
+    "version": "5.5.11",
    "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
    "homepage": "https://github.com/nextcloud/calendar/",
    "licenses": [
@@ -40,9 +40,9 @@
    ]
  },
  "contacts": {
-    "hash": "sha256-hUYfZ3EX0sLOWoaH7NGpashgKS8gf0YPpwwEniJL0jk=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.3.8/contacts-v7.3.8.tar.gz",
-    "version": "7.3.8",
+    "hash": "sha256-543zSjxmqSnBPypr8Wdp4SH8zamXDCMl20B5nYxvgIM=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.3.9/contacts-v7.3.9.tar.gz",
+    "version": "7.3.9",
    "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
    "homepage": "https://github.com/nextcloud/contacts#readme",
    "licenses": [
@@ -80,9 +80,9 @@
    ]
  },
  "deck": {
-    "hash": "sha256-d3z0Z+3zc25kqmlz+mZkqsmRxoENIYBXiL4pwURJCNI=",
-    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.15.5/deck-v1.15.5.tar.gz",
-    "version": "1.15.5",
+    "hash": "sha256-p4En/Bq86s3Ee1/z9VyXWl/f6yUNv04QuLjhnNJWbLk=",
+    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.15.6/deck-v1.15.6.tar.gz",
+    "version": "1.15.6",
    "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
    "homepage": "https://github.com/nextcloud/deck",
    "licenses": [
@@ -100,9 +100,9 @@
    ]
  },
  "files_automatedtagging": {
-    "hash": "sha256-N97nmZb1kCoci50hQBL6rAViEeekUCzRed3EMTCkbgg=",
-    "url": "https://github.com/nextcloud-releases/files_automatedtagging/releases/download/v2.0.1/files_automatedtagging-v2.0.1.tar.gz",
-    "version": "2.0.1",
+    "hash": "sha256-JoIweqA2YBF80PU3BjkqARvKqpKlrYt8n6t0Zc/0Ouk=",
+    "url": "https://github.com/nextcloud-releases/files_automatedtagging/releases/download/v2.0.2/files_automatedtagging-v2.0.2.tar.gz",
+    "version": "2.0.2",
    "description": "An app for Nextcloud that automatically assigns tags to newly uploaded files based on some conditions.\n\nThe tags can later be used to control retention, file access, automatic script execution and more.\n\n## How it works\nTo define tags, administrators can create and manage a set of rule groups. Each rule group consists of one or more rules combined through operators. Rules can include criteria like file type, size, time and more. A request matches a group if all rules evaluate to true. On uploading a file all defined groups are evaluated and when matching, the given tags are assigned to the file.",
    "homepage": "https://github.com/nextcloud/files_automatedtagging",
    "licenses": [
@@ -150,10 +150,10 @@
    ]
  },
  "groupfolders": {
-    "hash": "sha256-UJyKjn3nurTVw2+F2zwDgPGyJ94F3rQb9p5HUARNWa4=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.11/groupfolders-v19.1.11.tar.gz",
-    "version": "19.1.11",
-    "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.",
+    "hash": "sha256-fdhSyNhZQPj7nRaUI9PogMuPOadGndLh+CAIaKXlDa0=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.12/groupfolders-v19.1.12.tar.gz",
+    "version": "19.1.12",
+    "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.",
    "homepage": "https://github.com/nextcloud/groupfolders",
    "licenses": [
      "agpl"
@@ -200,9 +200,9 @@
    ]
  },
  "mail": {
-    "hash": "sha256-NKfGt1KNri30fB4WeIhcnOjWooRJ8GCY9nCbl2X66W8=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.6.4/mail-v5.6.4.tar.gz",
-    "version": "5.6.4",
+    "hash": "sha256-09cHSwrHODzvp+aOZN+WlKgG2nrdCGgjmSWpvmdlvGw=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.6.5/mail-v5.6.5.tar.gz",
+    "version": "5.6.5",
    "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
    "homepage": "https://github.com/nextcloud/mail#readme",
    "licenses": [
@@ -220,10 +220,10 @@
    ]
  },
  "music": {
-    "hash": "sha256-dFY3/jlZc0uuE3d26A/kBjZ7FtM1BJdc1Wq8SrlsnME=",
-    "url": "https://github.com/owncloud/music/releases/download/v2.4.1/music_2.4.1_for_nextcloud.tar.gz",
-    "version": "2.4.1",
-    "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard",
+    "hash": "sha256-XxrpVge6T3vP9aAj9ZpxEaQMRvKYkTSt2fEREudbt2U=",
+    "url": "https://github.com/owncloud/music/releases/download/v2.5.1/music_2.5.1_for_nextcloud.tar.gz",
+    "version": "2.5.1",
+    "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to scrobble plays and/or see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard",
    "homepage": "https://github.com/owncloud/music",
    "licenses": [
      "agpl"
@@ -270,9 +270,9 @@
    ]
  },
  "onlyoffice": {
-    "hash": "sha256-0g8y69XNKx8iEG0GM3hmIvnqACxO4YC3i83rNs9hsB8=",
-    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.11.0/onlyoffice.tar.gz",
-    "version": "9.11.0",
+    "hash": "sha256-lAe1J2QKsEWS4l4QOiISDi9iyVCEyO8tS94aNMjUUR4=",
+    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.12.0/onlyoffice.tar.gz",
+    "version": "9.12.0",
    "description": "The ONLYOFFICE app for Nextcloud brings powerful document editing and collaboration tools directly to your Nextcloud environment. With this integration, you can seamlessly create, edit, and co-author text documents, spreadsheets, presentations, and PDFs, as well as build and fill out PDF forms.\n\nCollaborate with your team in real time, make use of Track Changes, version history, comments, integrated chat, and more. Work together on files with federated cloud sharing. Flexible access permissions allow you to control who can view, edit, or comment, ensuring secure role-based collaboration tailored to your needs. Documents can also be protected with watermarks, password settings, and encryption for added security.\n\nThe app offers support for over 50 file formats, including DOCX, XLSX, PPTX, PDF, RTF, TXT, CSV, ODT, ODS, ODP, EPUB, FB2, HTML, HWP, HWPX, Pages, Numbers, Keynote, etc. Seamless desktop and mobile app integration means you'll have access to your Nextcloud files wherever you go.\n\nFurthermore, you can seamlessly connect any AI assistant, including local ones, directly to the editors to work faster and more efficient. This allows you to leverage various AI models for tasks like chatbot interactions, translations, OCR, and more.\n\nWhether you’re working with internal teams or external collaborators, the ONLYOFFICE app for Nextcloud enhances productivity, simplifies workflows, and ensures your files remain secure.",
    "homepage": "https://www.onlyoffice.com",
    "licenses": [
@@ -290,9 +290,9 @@
    ]
  },
  "polls": {
-    "hash": "sha256-texrfkRr18HMRp2cIgpW/PRrRT4Bu/CjqH9arttv3hA=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.5.0/polls-v8.5.0.tar.gz",
-    "version": "8.5.0",
+    "hash": "sha256-xhnTAdsM9EKR7BFW0GMyyUptvjgevZU567c++c0GuqM=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.6.2/polls-v8.6.2.tar.gz",
+    "version": "8.6.2",
    "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).",
    "homepage": "https://github.com/nextcloud/polls",
    "licenses": [
@@ -340,13 +340,13 @@
    ]
  },
  "repod": {
-    "hash": "sha256-wYQYRHSWqMMrhOnth/nX0oQzpBbU1xyf1Sieb21hVqY=",
-    "url": "https://git.crystalyx.net/Xefir/repod/releases/download/3.8.2/repod.tar.gz",
-    "version": "3.8.2",
+    "hash": "sha256-fjGlFyZJAuD6nd8NaVFLu8c7p0U3rzQBowetCQ7jknk=",
+    "url": "https://git.crystalyx.net/Xefir/repod/releases/download/3.9.0/repod.tar.gz",
+    "version": "3.9.0",
    "description": "## Features\n- 🔍 Browse and subscribe huge collection of podcasts\n- 🔊 Listen to episodes directly in Nextcloud\n- 🌐 Sync your activity with [AntennaPod](https://antennapod.org/) and [other apps](https://git.crystalyx.net/Xefir/repod#clients-supporting-sync-of-gpoddersync)\n- 📱 Mobile friendly interface\n- 📡 Import and export your subscriptions\n- ➡️ Full features comparison [here](https://git.crystalyx.net/Xefir/repod#comparaison-with-similar-apps-for-nextcloud)\n\n## Requirements\nYou need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!",
    "homepage": "https://git.crystalyx.net/Xefir/repod",
    "licenses": [
-      "agpl"
+      "AGPL-3.0-or-later"
    ]
  },
  "richdocuments": {
@@ -370,9 +370,9 @@
    ]
  },
  "spreed": {
-    "hash": "sha256-rpYU0ngtjBuOH6c3fSYRCcbLj9VC26GECXbzSGweMro=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.5/spreed-v21.1.5.tar.gz",
-    "version": "21.1.5",
+    "hash": "sha256-O4nEUZ4EeaYLqLDJ3AFsAH8T2aV8hsR5yxxje3R+sZs=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.1.7/spreed-v21.1.7.tar.gz",
+    "version": "21.1.7",
    "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
    "homepage": "https://github.com/nextcloud/spreed",
    "licenses": [
@@ -380,10 +380,10 @@
    ]
  },
  "tables": {
-    "hash": "sha256-ApxhTVSaq3qmFeJCIswlfNHjSxaCbG8YUITpKrumzmc=",
-    "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.1/tables-v1.0.1.tar.gz",
-    "version": "1.0.1",
-    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
+    "hash": "sha256-CrzPF/cSfARid5zgZA8YV8LM0GFrwbgDWCLVHBufNt0=",
+    "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.2/tables-v1.0.2.tar.gz",
+    "version": "1.0.2",
+    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n- Users, groups and teams\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
    "homepage": "https://github.com/nextcloud/tables",
    "licenses": [
      "agpl"
@@ -460,9 +460,9 @@
    ]
  },
  "user_oidc": {
-    "hash": "sha256-e4RnB1CQkQRv4Nl/9oHg0XBhuhrSzqGGsnXSsd0HwbY=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.1.0/user_oidc-v8.1.0.tar.gz",
-    "version": "8.1.0",
+    "hash": "sha256-DDijFnQIxKLmGjQF2AdFfqQuoWu6qAr61yKN9Of89ko=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.2.2/user_oidc-v8.2.2.tar.gz",
+    "version": "8.2.2",
    "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
    "homepage": "https://github.com/nextcloud/user_oidc",
    "licenses": [
@@ -480,9 +480,9 @@
    ]
  },
  "whiteboard": {
-    "hash": "sha256-H9iRas76993ApcJpKyZfPkfpcbElza6QkbgYJjT3X0I=",
-    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.4.2/whiteboard-v1.4.2.tar.gz",
-    "version": "1.4.2",
+    "hash": "sha256-JNOne206X+/2uQV6Tj9W3q5x2BYCl1DUnAAfXK81Msc=",
+    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.5.0/whiteboard-v1.5.0.tar.gz",
+    "version": "1.5.0",
    "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",
    "homepage": "https://github.com/nextcloud/whiteboard",
    "licenses": [
@@ -10,9 +10,9 @@
    ]
  },
  "calendar": {
-    "hash": "sha256-TNvpCDc1daI7/MOMR3juoQyvcYV1ht72HjlPEpazHBw=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.1.1/calendar-v6.1.1.tar.gz",
-    "version": "6.1.1",
+    "hash": "sha256-Kxs/PRKFt30CMyU0NeOxHy6sAm8vRBJ4xXLuupRrpgE=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.1.3/calendar-v6.1.3.tar.gz",
+    "version": "6.1.3",
    "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
    "homepage": "https://github.com/nextcloud/calendar/",
    "licenses": [
@@ -30,9 +30,9 @@
    ]
  },
  "contacts": {
-    "hash": "sha256-d6O48uYTjoquC/XwtJ2QdPCbmxko0X6+8MiKb7UIpao=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.1.1/contacts-v8.1.1.tar.gz",
-    "version": "8.1.1",
+    "hash": "sha256-i70tENa8uQxnYD2LsURET2LOrENtgUskLuiY9mO+fGA=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.1.2/contacts-v8.1.2.tar.gz",
+    "version": "8.1.2",
    "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
    "homepage": "https://github.com/nextcloud/contacts#readme",
    "licenses": [
@@ -70,9 +70,9 @@
    ]
  },
  "deck": {
-    "hash": "sha256-9W5R8RcZJKuUmB99urRNU0mXHBEg8y239Yzmsq9plIQ=",
-    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.16.2/deck-v1.16.2.tar.gz",
-    "version": "1.16.2",
+    "hash": "sha256-RqY3onLYYw03MRWvZvwdO9QkleXB8Tz1q6OnkGqTsuY=",
+    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.16.3/deck-v1.16.3.tar.gz",
+    "version": "1.16.3",
    "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
    "homepage": "https://github.com/nextcloud/deck",
    "licenses": [
@@ -90,9 +90,9 @@
    ]
  },
  "files_automatedtagging": {
-    "hash": "sha256-P+0V89WGXxCtcdZI8vGCTnKsDehumfRWOcMN6bwT+QE=",
-    "url": "https://github.com/nextcloud-releases/files_automatedtagging/releases/download/v3.0.1/files_automatedtagging-v3.0.1.tar.gz",
-    "version": "3.0.1",
+    "hash": "sha256-R9YSVv+m3TFZ1GFU1BJ2yUBFNoy0dzOq4alYgoThOVk=",
+    "url": "https://github.com/nextcloud-releases/files_automatedtagging/releases/download/v3.0.2/files_automatedtagging-v3.0.2.tar.gz",
+    "version": "3.0.2",
    "description": "An app for Nextcloud that automatically assigns tags to newly uploaded files based on some conditions.\n\nThe tags can later be used to control retention, file access, automatic script execution and more.\n\n## How it works\nTo define tags, administrators can create and manage a set of rule groups. Each rule group consists of one or more rules combined through operators. Rules can include criteria like file type, size, time and more. A request matches a group if all rules evaluate to true. On uploading a file all defined groups are evaluated and when matching, the given tags are assigned to the file.",
    "homepage": "https://github.com/nextcloud/files_automatedtagging",
    "licenses": [
@@ -130,10 +130,10 @@
    ]
  },
  "groupfolders": {
-    "hash": "sha256-D8NzAIlF8ObpH1P7LGKpc5AjYQ6NaNjz9y7gxfUFSu0=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v20.1.5/groupfolders-v20.1.5.tar.gz",
-    "version": "20.1.5",
-    "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.",
+    "hash": "sha256-tY/8Rn7EVgcRGDILcENqWGaQ+z6916iOQNcNOtRBgtQ=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v20.1.6/groupfolders-v20.1.6.tar.gz",
+    "version": "20.1.6",
+    "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.",
    "homepage": "https://github.com/nextcloud/groupfolders",
    "licenses": [
      "agpl"
@@ -180,9 +180,9 @@
    ]
  },
  "mail": {
-    "hash": "sha256-NKfGt1KNri30fB4WeIhcnOjWooRJ8GCY9nCbl2X66W8=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.6.4/mail-v5.6.4.tar.gz",
-    "version": "5.6.4",
+    "hash": "sha256-09cHSwrHODzvp+aOZN+WlKgG2nrdCGgjmSWpvmdlvGw=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.6.5/mail-v5.6.5.tar.gz",
+    "version": "5.6.5",
    "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
    "homepage": "https://github.com/nextcloud/mail#readme",
    "licenses": [
@@ -190,10 +190,10 @@
    ]
  },
  "music": {
-    "hash": "sha256-dFY3/jlZc0uuE3d26A/kBjZ7FtM1BJdc1Wq8SrlsnME=",
-    "url": "https://github.com/owncloud/music/releases/download/v2.4.1/music_2.4.1_for_nextcloud.tar.gz",
-    "version": "2.4.1",
-    "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard",
+    "hash": "sha256-XxrpVge6T3vP9aAj9ZpxEaQMRvKYkTSt2fEREudbt2U=",
+    "url": "https://github.com/owncloud/music/releases/download/v2.5.1/music_2.5.1_for_nextcloud.tar.gz",
+    "version": "2.5.1",
+    "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to scrobble plays and/or see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard",
    "homepage": "https://github.com/owncloud/music",
    "licenses": [
      "agpl"
@@ -230,9 +230,9 @@
    ]
  },
  "onlyoffice": {
-    "hash": "sha256-0g8y69XNKx8iEG0GM3hmIvnqACxO4YC3i83rNs9hsB8=",
-    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.11.0/onlyoffice.tar.gz",
-    "version": "9.11.0",
+    "hash": "sha256-lAe1J2QKsEWS4l4QOiISDi9iyVCEyO8tS94aNMjUUR4=",
+    "url": "https://github.com/ONLYOFFICE/onlyoffice-nextcloud/releases/download/v9.12.0/onlyoffice.tar.gz",
+    "version": "9.12.0",
    "description": "The ONLYOFFICE app for Nextcloud brings powerful document editing and collaboration tools directly to your Nextcloud environment. With this integration, you can seamlessly create, edit, and co-author text documents, spreadsheets, presentations, and PDFs, as well as build and fill out PDF forms.\n\nCollaborate with your team in real time, make use of Track Changes, version history, comments, integrated chat, and more. Work together on files with federated cloud sharing. Flexible access permissions allow you to control who can view, edit, or comment, ensuring secure role-based collaboration tailored to your needs. Documents can also be protected with watermarks, password settings, and encryption for added security.\n\nThe app offers support for over 50 file formats, including DOCX, XLSX, PPTX, PDF, RTF, TXT, CSV, ODT, ODS, ODP, EPUB, FB2, HTML, HWP, HWPX, Pages, Numbers, Keynote, etc. Seamless desktop and mobile app integration means you'll have access to your Nextcloud files wherever you go.\n\nFurthermore, you can seamlessly connect any AI assistant, including local ones, directly to the editors to work faster and more efficient. This allows you to leverage various AI models for tasks like chatbot interactions, translations, OCR, and more.\n\nWhether you’re working with internal teams or external collaborators, the ONLYOFFICE app for Nextcloud enhances productivity, simplifies workflows, and ensures your files remain secure.",
    "homepage": "https://www.onlyoffice.com",
    "licenses": [
@@ -250,9 +250,9 @@
    ]
  },
  "polls": {
-    "hash": "sha256-texrfkRr18HMRp2cIgpW/PRrRT4Bu/CjqH9arttv3hA=",
-    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.5.0/polls-v8.5.0.tar.gz",
-    "version": "8.5.0",
+    "hash": "sha256-xhnTAdsM9EKR7BFW0GMyyUptvjgevZU567c++c0GuqM=",
+    "url": "https://github.com/nextcloud-releases/polls/releases/download/v8.6.2/polls-v8.6.2.tar.gz",
+    "version": "8.6.2",
    "description": "A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).",
    "homepage": "https://github.com/nextcloud/polls",
    "licenses": [
@@ -300,13 +300,13 @@
    ]
  },
  "repod": {
-    "hash": "sha256-wYQYRHSWqMMrhOnth/nX0oQzpBbU1xyf1Sieb21hVqY=",
-    "url": "https://git.crystalyx.net/Xefir/repod/releases/download/3.8.2/repod.tar.gz",
-    "version": "3.8.2",
+    "hash": "sha256-fjGlFyZJAuD6nd8NaVFLu8c7p0U3rzQBowetCQ7jknk=",
+    "url": "https://git.crystalyx.net/Xefir/repod/releases/download/3.9.0/repod.tar.gz",
+    "version": "3.9.0",
    "description": "## Features\n- 🔍 Browse and subscribe huge collection of podcasts\n- 🔊 Listen to episodes directly in Nextcloud\n- 🌐 Sync your activity with [AntennaPod](https://antennapod.org/) and [other apps](https://git.crystalyx.net/Xefir/repod#clients-supporting-sync-of-gpoddersync)\n- 📱 Mobile friendly interface\n- 📡 Import and export your subscriptions\n- ➡️ Full features comparison [here](https://git.crystalyx.net/Xefir/repod#comparaison-with-similar-apps-for-nextcloud)\n\n## Requirements\nYou need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!",
    "homepage": "https://git.crystalyx.net/Xefir/repod",
    "licenses": [
-      "agpl"
+      "AGPL-3.0-or-later"
    ]
  },
  "richdocuments": {
@@ -330,9 +330,9 @@
    ]
  },
  "spreed": {
-    "hash": "sha256-/mkCCKGUoIqRumVIHL+fPKk4y0NOkdVvk71Mzk889BM=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v22.0.4/spreed-v22.0.4.tar.gz",
-    "version": "22.0.4",
+    "hash": "sha256-R5LH7wiBwURBfJAJfO/cg1IpH/HhFQ0XEcJNmJPQhTA=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v22.0.7/spreed-v22.0.7.tar.gz",
+    "version": "22.0.7",
    "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
    "homepage": "https://github.com/nextcloud/spreed",
    "licenses": [
@@ -340,10 +340,10 @@
    ]
  },
  "tables": {
-    "hash": "sha256-ApxhTVSaq3qmFeJCIswlfNHjSxaCbG8YUITpKrumzmc=",
-    "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.1/tables-v1.0.1.tar.gz",
-    "version": "1.0.1",
-    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
+    "hash": "sha256-CrzPF/cSfARid5zgZA8YV8LM0GFrwbgDWCLVHBufNt0=",
+    "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.2/tables-v1.0.2.tar.gz",
+    "version": "1.0.2",
+    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n- Users, groups and teams\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
    "homepage": "https://github.com/nextcloud/tables",
    "licenses": [
      "agpl"
@@ -410,9 +410,9 @@
    ]
  },
  "user_oidc": {
-    "hash": "sha256-e4RnB1CQkQRv4Nl/9oHg0XBhuhrSzqGGsnXSsd0HwbY=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.1.0/user_oidc-v8.1.0.tar.gz",
-    "version": "8.1.0",
+    "hash": "sha256-DDijFnQIxKLmGjQF2AdFfqQuoWu6qAr61yKN9Of89ko=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.2.2/user_oidc-v8.2.2.tar.gz",
+    "version": "8.2.2",
    "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
    "homepage": "https://github.com/nextcloud/user_oidc",
    "licenses": [
@@ -430,9 +430,9 @@
    ]
  },
  "whiteboard": {
-    "hash": "sha256-H9iRas76993ApcJpKyZfPkfpcbElza6QkbgYJjT3X0I=",
-    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.4.2/whiteboard-v1.4.2.tar.gz",
-    "version": "1.4.2",
+    "hash": "sha256-JNOne206X+/2uQV6Tj9W3q5x2BYCl1DUnAAfXK81Msc=",
+    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.5.0/whiteboard-v1.5.0.tar.gz",
+    "version": "1.5.0",
    "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",
    "homepage": "https://github.com/nextcloud/whiteboard",
    "licenses": [
@@ -109,7 +109,7 @@ let
  # Allow both:
  # { /* the config */ } and
  # { pkgs, ... } : { /* the config */ }
-  config1 = if lib.isFunction config0 then config0 { inherit pkgs; } else config0;
+  config1 = if lib.isFunction config0 then config0 { inherit lib pkgs; } else config0;

  configEval = lib.evalModules {
    modules = [
@@ -252,6 +252,7 @@ mapAliases {
  lmcloud = throw "'lmcloud' has been renamed to/replaced by 'pylamarzocco'"; # Converted to throw 2025-10-29
  logilab_common = throw "'logilab_common' has been renamed to/replaced by 'logilab-common'"; # Converted to throw 2025-10-29
  loo-py = throw "'loo-py' has been renamed to/replaced by 'loopy'"; # Converted to throw 2025-10-29
+  lsprotocol_2025 = lsprotocol; # added 2026-01-05
  lxml-stubs = throw "'lxml-stubs' has been removed as it was broken and unmaintained upstream. Consider using 'types-lxml' instead."; # Converted to throw 2025-11-07
  lzstring = throw "'lzstring' has been removed as it was unmaintained upstream"; # Added 2025-11-22
  mac_alias = throw "'mac_alias' has been renamed to/replaced by 'mac-alias'"; # Converted to throw 2025-10-29
@@ -337,6 +338,7 @@ mapAliases {
  pyflunearyou = throw "'pyflunearyou' has been renamed to/replaced by 'pyoutbreaksnearme'"; # Converted to throw 2025-10-29
  pygame_sdl2 = throw "'pygame_sdl2' has been renamed to/replaced by 'pygame-sdl2'"; # Converted to throw 2025-10-29
  PyGithub = throw "'PyGithub' has been renamed to/replaced by 'pygithub'"; # Converted to throw 2025-10-29
+  pygls_2 = pygls; # added 2026-01-05
  pyheif = throw "pyheif has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17
  pyhiveapi = throw "'pyhiveapi' has been renamed to/replaced by 'pyhive-integration'"; # Converted to throw 2025-10-29
  pyialarmxr = throw "'pyialarmxr' has been renamed to/replaced by 'pyialarmxr-homeassistant'"; # Converted to throw 2025-10-29
@@ -9126,12 +9126,10 @@ self: super: with self; {

  lsp-tree-sitter = callPackage ../development/python-modules/lsp-tree-sitter { };

-  lsprotocol = lsprotocol_2023;
+  lsprotocol = callPackage ../development/python-modules/lsprotocol { };

  lsprotocol_2023 = callPackage ../development/python-modules/lsprotocol/2023.nix { };

-  lsprotocol_2025 = callPackage ../development/python-modules/lsprotocol/2025.nix { };
-
  ltpycld2 = callPackage ../development/python-modules/ltpycld2 { };

  lttng = callPackage ../development/python-modules/lttng { };
@@ -13492,15 +13490,9 @@ self: super: with self; {

  pyglossary = callPackage ../development/python-modules/pyglossary { };

-  pygls = pygls_1;
+  pygls = callPackage ../development/python-modules/pygls { };

-  pygls_1 = callPackage ../development/python-modules/pygls/1.nix {
-    lsprotocol = lsprotocol_2023;
-  };
-
-  pygls_2 = callPackage ../development/python-modules/pygls/2.nix {
-    lsprotocol = lsprotocol_2025;
-  };
+  pygls_1 = callPackage ../development/python-modules/pygls/1.nix { };

  pygltflib = callPackage ../development/python-modules/pygltflib { };