Merge staging-next into staging

2025-07-30 00:20:08 +00:00
parent 6a5e5fa747 e8bb0051ab
commit 5aeab90c8f
28 changed files with 137 additions and 1102 deletions
@@ -192,7 +192,7 @@ in
                            "NOINTERCEPT"
                          ]);
                        description = ''
-                          Options for running the command. Refer to the [sudo manual](https://www.sudo.ws/docs/man/1.9.15/sudoers.man/#Tag_Spec).
+                          Options for running the command. Refer to the [sudo manual](https://www.sudo.ws/docs/man/1.9.17/sudoers.man/#Tag_Spec).
                        '';
                        default = [ ];
                      };
@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
  core = "play";
-  version = "0-unstable-2025-07-09";
+  version = "0-unstable-2025-07-23";

  src = fetchFromGitHub {
    owner = "jpd002";
    repo = "Play-";
-    rev = "ae9afb4e45e8de35382fb98c55d13dec9fcf8ed8";
-    hash = "sha256-HWKhgGChPGhRmrXXbjEvBt0coGpQ1JAPUTd8Ze4yKww=";
+    rev = "78c184bca1063d5482cbfad924af72dd23ebbff1";
+    hash = "sha256-0n6PQqepc7xKVMf8slN9aOodzBbt7J2c68z7200q07M=";
    fetchSubmodules = true;
  };

@@ -70,6 +70,11 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-kESKpIke9Xi4A55i3mUu1JkDjp8voBJBixiAK8pUkKA=";
  };

+  patches = [
+    # Introduced by https://github.com/Tencent/rapidjson/commit/b1c0c2843fcb2aca9ecc650fc035c57ffc13697c#diff-2f1bcf2729ff7c408adb0c2cc2cfa01602bd5646b05b3e4bc7e46b606035d249R21
+    ./rapidjson.patch
+  ];
+
  postPatch = ''
    mkdir src/private
    substituteInPlace scripts/build/macOS/fix_bundle.py \
@@ -0,0 +1,18 @@
+diff --git a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
+index ba95962..66a96a8 100644
+--- a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
+++ b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
+@@ -2,8 +2,11 @@
+ 
+ if(NOT ${_OPT}use_rapidjson STREQUAL "off")
+    if(NOT TARGET rapidjson::rapidjson)
+-      if(TARGET rapidjson)
+-         add_library( rapidjson::rapidjson ALIAS rapidjson )
+      if(TARGET RapidJSON)
+         if(NOT TARGET rapidjson)
+            add_library(rapidjson ALIAS RapidJSON)
+         endif()
+         add_library( rapidjson::rapidjson ALIAS RapidJSON )
+       else()
+          # At least on Arch RapidJSONConfig.cmake does not define a target at all
+          # so we have to do it ourselves
@@ -65,14 +65,14 @@ let
 in
 py.pkgs.buildPythonApplication rec {
  pname = "awscli2";
-  version = "2.27.50"; # N.B: if you change this, check if overrides are still up-to-date
+  version = "2.27.61"; # N.B: if you change this, check if overrides are still up-to-date
  pyproject = true;

  src = fetchFromGitHub {
    owner = "aws";
    repo = "aws-cli";
    tag = version;
-    hash = "sha256-ITiZ144YFhwuRcfhulLF0jxpp1OgznEE8frx4Yn4V+A=";
+    hash = "sha256-2lcPqNrGAHvPPVZIQaDbI54sQQ7OsOiMxUx6qg6WeNU=";
  };

  postPatch = ''
@@ -81,7 +81,7 @@ py.pkgs.buildPythonApplication rec {
      --replace-fail 'awscrt==' 'awscrt>=' \
      --replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \
      --replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \
-      --replace-fail 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24' \
+      --replace-fail 'prompt-toolkit>=3.0.24,<3.0.52' 'prompt-toolkit>=3.0.24' \
      --replace-fail 'ruamel.yaml.clib>=0.2.0,<=0.2.12' 'ruamel.yaml.clib>=0.2.0' \

    substituteInPlace requirements-base.txt \
@@ -6,7 +6,6 @@
  nixosTests,
  python3Packages,
 }:
-
 python3Packages.buildPythonApplication rec {
  pname = "calibre-web";
  version = "0.6.24";
@@ -134,6 +133,7 @@ python3Packages.buildPythonApplication rec {
    "pypdf"
    "regex"
    "tornado"
+    "unidecode"
  ];

  nativeCheckInputs = lib.flatten (lib.attrValues optional-dependencies);
@@ -9,19 +9,16 @@
  libxslt,
  shaka-packager,
  nix-update-script,
+  runCommand,
 }:

 let
  # dash-mpd-cli looks for a binary named `shaka-packager`, while
  # shaka-packager provides `packager`.
-  shaka-packager-wrapped = stdenvNoCC.mkDerivation {
-    name = "shaka-packager-wrapped";
-    phases = [ "installPhase" ];
-    installPhase = ''
-      mkdir -p $out/bin
-      ln -s ${lib.getExe shaka-packager} $out/bin/shaka-packager
-    '';
-  };
+  shaka-packager-wrapped = runCommand "shaka-packager-wrapped" { } ''
+    mkdir -p $out/bin
+    ln -s ${lib.getExe shaka-packager} $out/bin/shaka-packager
+  '';
 in
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "dash-mpd-cli";
@@ -8,11 +8,11 @@

 let
  pname = "fiddler-everywhere";
-  version = "7.0.0";
+  version = "7.1.0";

  src = fetchurl {
    url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
-    hash = "sha256-pDXvzTuivQUjEr0mi/Bw98il6a1D7gJfQ5x5OuQu2wE=";
+    hash = "sha256-rgo2WGIk8s+xjh4oJ/YXw/SGc4sKnfIvZoFWAklT70Y=";
  };

  appimageContents = appimageTools.extract {
@@ -11,13 +11,13 @@

 buildNpmPackage rec {
  pname = "ghostfolio";
-  version = "2.183.0";
+  version = "2.185.0";

  src = fetchFromGitHub {
    owner = "ghostfolio";
    repo = "ghostfolio";
    tag = version;
-    hash = "sha256-ejjuNNCp81UM0B6cvQTL31MO49/zDKPJsXY4dZV1X/E=";
+    hash = "sha256-jnC2u9ZZcOSux6UUzW9Ot02aFWeGYhrdCC9d4xM0efA=";
    # 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;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
    '';
  };

-  npmDepsHash = "sha256-oApG8QOUteoqhVvAGIDMX0Zef2dV2E49EsekyhV7G4c=";
+  npmDepsHash = "sha256-FCH0v9jRviH33mfIVX8967X1u494qToHraYVn5pbSPw=";

  nativeBuildInputs = [
    prisma
@@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "gosmee";
-  version = "0.26.1";
+  version = "0.27.0";

  src = fetchFromGitHub {
    owner = "chmouel";
    repo = "gosmee";
    rev = "v${version}";
-    hash = "sha256-qNO7mY03aWabTeUm8rXojy2Ek2IKNG6wimVhwZKxh9g=";
+    hash = "sha256-MoSfEnciYn+Lv695aZUl27o8VtmmKf0KbELLJb06hqY=";
  };
  vendorHash = null;

@@ -7,18 +7,18 @@

 rustPlatform.buildRustPackage rec {
  pname = "harper";
-  version = "0.52.0";
+  version = "0.53.0";

  src = fetchFromGitHub {
    owner = "Automattic";
    repo = "harper";
    rev = "v${version}";
-    hash = "sha256-Mwgdombfc01Ss8Sy/pMwHNWeI1lxC1riFql9FtqaBmY=";
+    hash = "sha256-huAwuUiSaKaw0689AmYq0/usEq2p+cX73Oy5O0CaCVM=";
  };

  buildAndTestSubdir = "harper-ls";

-  cargoHash = "sha256-aOajrh2NZShP1vXSUEDzY1ULTeMs8dY+BDIspCi1BfY=";
+  cargoHash = "sha256-4ppwbOv+8a4d9v6zbIFkhNWp1s3yMTfX1oNCYAccB3w=";

  passthru.updateScript = nix-update-script { };

@@ -6,13 +6,13 @@
 }:
 buildGoModule {
  pname = "jqfmt";
-  version = "0-unstable-2024-08-15";
+  version = "0-unstable-2025-07-28";

  src = fetchFromGitHub {
    owner = "noperator";
    repo = "jqfmt";
-    rev = "8fc6f864c295e6bd6b08f36f503b3d809270da61";
-    hash = "sha256-tvFp1SJeosJdCHs3c+vceBfacypJc/aFYSj55mBfkB8=";
+    rev = "74b59e03caff3ac5a8c061088d2c228a5c27b171";
+    hash = "sha256-3PYIyjZm265atBAfuj5aHmWoAv4H29I7gN4/rjl1d0o=";
  };

  vendorHash = "sha256-avpZSgQKFZxLmYGj+2Gi+wSDHnAgF0/hyp4HtoQ0ZCo=";
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
  # without further configuration).
  configureFlags = [
    "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
-    ''--with-udevrule="OWNER=\"root\", GROUP=\"myusergroup\", MODE=\"0660\""''
+    ''--with-udevrule=OWNER="root",GROUP="myusergroup",MODE="0660"''
  ];

  meta = with lib; {
@@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
    license = lib.licenses.x11;
    maintainers = [ ];
    pkgConfigModules = [ "pthread-stubs" ];
-    # on these platforms according to the readme
-    platforms = with lib.platforms; linux ++ cygwin ++ darwin ++ [ "x86_64-solaris" ];
+    platforms = lib.platforms.unix;
  };
 })
@@ -42,14 +42,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
  pname = "limine";
-  version = "9.5.0";
+  version = "9.5.1";

  # We don't use the Git source but the release tarball, as the source has a
  # `./bootstrap` script performing network access to download resources.
  # Packaging that in Nix is very cumbersome.
  src = fetchurl {
    url = "https://github.com/limine-bootloader/limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-SWJ5e6/q92UyC0ea8yJAYcFNr5LreJ2qFY7hcunovEM=";
+    hash = "sha256-UgY8S+XGlSnO1k98JWBfSN0/IY3LANVFgJwI1kdPAcU=";
  };

  enableParallelBuilding = true;
@@ -38,9 +38,13 @@ stdenv.mkDerivation (finalAttrs: {
    "-DMANIFOLD_PAR=TBB"
  ];

+  excludedTestPatterns = lib.optionals stdenv.isDarwin [
+    # https://github.com/elalish/manifold/issues/1306
+    "Manifold.Simplify"
+  ];
  doCheck = true;
  checkPhase = ''
-    test/manifold_test --gtest_filter=-CrossSection.RoundOffset
+    test/manifold_test --gtest_filter=-${builtins.concatStringsSep ":" finalAttrs.excludedTestPatterns}
  '';

  passthru = {
@@ -10,18 +10,18 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "openlist-frontend";
-  version = "4.0.8";
+  version = "4.0.9";

  src = fetchFromGitHub {
    owner = "OpenListTeam";
    repo = "OpenList-Frontend";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-q/FZ9SMdNDPHmZlNeh8GcyRE6iwvI7X+Ic8InerjOps=";
+    hash = "sha256-QR5Rh09pO7j9ecmHTbm64Om/rhqX8XaczNqAHMO1XiU=";
  };

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

@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  pnpmDeps = pnpm_10.fetchDeps {
    inherit (finalAttrs) pname version src;
    fetcherVersion = 1;
-    hash = "sha256-PTZ+Vhg3hNnORnulkzuVg6TF/jY0PvUWYja9z7S4GdM=";
+    hash = "sha256-ty9mElTSiDbXHm9vgguzszY/F+YP8hPfbAlQnjdAaJE=";
  };

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

 buildGoModule (finalAttrs: {
  pname = "openlist";
-  version = "4.0.8";
+  version = "4.0.9";

  src = fetchFromGitHub {
    owner = "OpenListTeam";
    repo = "OpenList";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-pihGG9vm0wyny9DuN110Nb6cwxvG5oP2RqcoWSOWRes=";
+    hash = "sha256-RsTcaq5w5EY+zddjTI5BJuDqmbFmZwxq4ng9NUXZvIk=";
    # 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-WnA5iDXCdBlBhnCxvD0PQYfu3bePAv9tJ3WNUTFNURo=";
+  vendorHash = "sha256-zDN2sw3oYVDTlP5qqe+RkcZ2Lup/vlB4jnluiA/wLLU=";

  buildInputs = [ fuse ];

@@ -8,16 +8,16 @@

 php.buildComposerProject2 (finalAttrs: {
  pname = "phpdocumentor";
-  version = "3.8.0";
+  version = "3.8.1";

  src = fetchFromGitHub {
    owner = "phpDocumentor";
    repo = "phpDocumentor";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-5wLfTitHr/6vF4c3o+I+l5ZnJGsjfH82kgml8goqUB4=";
+    hash = "sha256-iQA19FrXvVLzg+LaY1BcNmG8amMfKPVFwYbZ7dr+H9Q=";
  };

-  vendorHash = "sha256-dok1CHFrYVAM5z6k6HvYrHm84khmxDPz1KBUpMQJD/o=";
+  vendorHash = "sha256-sFRy9Hy9CVNjjYqbPbKH0XhoUdu4HlkiuHDDovTGono=";

  nativeBuildInputs = [ makeBinaryWrapper ];

@@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: {
  pname = "sudo";
  # be sure to check if nixos/modules/security/sudo.nix needs updating when bumping
  # e.g. links to man pages, value constraints etc.
-  version = "1.9.17p1";
+  version = "1.9.17p2";

  __structuredAttrs = true;

  src = fetchurl {
    url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz";
-    hash = "sha256-/2B+pxcHIZdzinj3eGks1t+afj5ARWX1HeBjyidFXTI=";
+    hash = "sha256-SjihqzrbEZklftwqfEor1xRmXrYFsENohDsG2tos/Ps=";
  };

  prePatch = ''
@@ -1,36 +1,73 @@
 {
  lib,
-  buildNpmPackage,
-  fetchurl,
+  stdenv,
+  fetchFromGitHub,
+  pnpm,
+  nodejs,
+  nix-update-script,
+  makeBinaryWrapper,
 }:
-
-buildNpmPackage rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "vue-language-server";
  version = "3.0.1";

-  src = fetchurl {
-    url = "https://registry.npmjs.org/@vue/language-server/-/language-server-${version}.tgz";
-    hash = "sha256-kSJgE94O1qYdd/YoRex8CJSprS15PpboTzChKnYj2nE=";
+  src = fetchFromGitHub {
+    owner = "vuejs";
+    repo = "language-tools";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-VPN4XWZDT44GwUZNih9sH2AiOKr8800B748DRoZ6hWc=";
  };

-  npmDepsHash = "sha256-S1kmTeReoAn428HaHQbwFzQg75rQNFVKVT1HT9m+7K4=";
-  forceGitDeps = true;
+  pnpmDeps = pnpm.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    fetcherVersion = 1;
+    hash = "sha256-X34wBcLHhCkpr6oFrUE33X8EjUjdSpV5TZQPYbMzRDs=";
+  };

-  postPatch = ''
-    ln -s ${./package-lock.json} package-lock.json
+  nativeBuildInputs = [
+    nodejs
+    pnpm.configHook
+    makeBinaryWrapper
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+    pnpm run build packages/language-server
+    runHook postBuild
  '';

-  dontNpmBuild = true;
-  makeCacheWritable = true;
+  preInstall = ''
+    pnpm prune --prod
+    find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} +

-  passthru.updateScript = ./update.sh;
+    # https://github.com/pnpm/pnpm/issues/3645
+    find node_modules packages/language-server/node_modules -xtype l -delete
+
+    # remove non-deterministic files
+    rm node_modules/.modules.yaml node_modules/.pnpm-workspace-state-v1.json
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,lib/language-tools}
+    cp -r {node_modules,packages,extensions} $out/lib/language-tools/
+
+    makeWrapper ${lib.getExe nodejs} $out/bin/vue-language-server \
+      --inherit-argv0 \
+      --add-flags $out/lib/language-tools/packages/language-server/bin/vue-language-server.js
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Official Vue.js language server";
    homepage = "https://github.com/vuejs/language-tools#readme";
-    changelog = "https://github.com/vuejs/language-tools/releases/tag/v${version}";
+    changelog = "https://github.com/vuejs/language-tools/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ friedow ];
    mainProgram = "vue-language-server";
  };
-}
+})
@@ -1,30 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p gnused nix nodejs prefetch-npm-deps wget
-
-set -euo pipefail
-pushd "$(dirname "${BASH_SOURCE[0]}")"
-
-version=$(npm view @vue/language-server version)
-tarball="language-server-$version.tgz"
-url="https://registry.npmjs.org/@vue/language-server/-/$tarball"
-
-if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then
-    echo "Already up to date!"
-    exit 0
-fi
-
-sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix
-
-sha256=$(nix-prefetch-url "$url")
-src_hash=$(nix-hash --to-sri --type sha256 "$sha256")
-sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix
-
-rm -f package-lock.json package.json *.tgz
-wget "$url"
-tar xf "$tarball" --strip-components=1 package/package.json
-npm i --package-lock-only --ignore-scripts
-npm_hash=$(prefetch-npm-deps package-lock.json)
-sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix
-rm -f package.json *.tgz
-
-popd
@@ -31,14 +31,14 @@

 buildPythonPackage rec {
  pname = "anthropic";
-  version = "0.55.0";
+  version = "0.59.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "anthropics";
    repo = "anthropic-sdk-python";
    tag = "v${version}";
-    hash = "sha256-2IdsWNQdp4Cr6xP1MDnj5EN/jyGcxuc5bTKg349DpI8=";
+    hash = "sha256-JUgJB0+9zfmj3asjn7FOozNB9STkKEvObbTP3KLDV+M=";
  };

  postPatch = ''
@@ -94,6 +94,12 @@ buildPythonPackage rec {
    "test_openai_get_num_tokens"
  ];

+  disabledTestPaths = [
+    # TODO recheck on next update. Langchain has been working on Pydantic errors.
+    # ValidationError from pydantic
+    "tests/unit_tests/chat_models/test_responses_stream.py"
+  ];
+
  pythonImportsCheck = [ "langchain_openai" ];

  passthru.updateScript = gitUpdater {
@@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "scikit-base";
-  version = "0.12.3";
+  version = "0.12.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "sktime";
    repo = "skbase";
    tag = "v${version}";
-    hash = "sha256-UaAzEw/crkHg7Gyu0xWdQwlqP8M/00Pv82+G3fXQ9hs=";
+    hash = "sha256-gyI/UCPAIH3gtW/e93w0D5e/HDdLA7GpSml/IJE8ipM=";
  };

  build-system = [ setuptools ];
@@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "snakemake-interface-logger-plugins";
-  version = "1.2.3";
+  version = "1.2.4";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "snakemake";
    repo = "snakemake-interface-logger-plugins";
    tag = "v${version}";
-    hash = "sha256-VHbta+R2a/K2L03IRu/Ya7dJzshIAvyK9cNIRbx8QqM=";
+    hash = "sha256-dXC6gV5Av8Ij3lVvgdEKzU2tAPiA5JdV3F2Xil5hjHs=";
  };

  nativeBuildInputs = [ hatchling ];
@@ -40,7 +40,7 @@

 buildPythonPackage rec {
  pname = "uiprotect";
-  version = "7.14.2";
+  version = "7.20.0";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
    owner = "uilibs";
    repo = "uiprotect";
    tag = "v${version}";
-    hash = "sha256-amCE5y/4tAdrvlk6ZSa6QaG9XuLnFfz1ml1r/H80fdE=";
+    hash = "sha256-mrTRLwqHiYsdVsmtsEv1ZZvhLquednbT0ME4HO1wC4I=";
  };

  build-system = [ poetry-core ];