Unverified Commit 3a4c73a2 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents c90b4b8a e97ba97f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "claude-code";
    publisher = "anthropic";
    version = "2.0.5";
    hash = "sha256-3+VrFM1aB26AfF8vkrFJXOfg07EGkwNa+nh1vvy6MFw=";
    version = "2.0.8";
    hash = "sha256-Aesfn/YAIVrKqrK9u3O7JsBkckdFJQK9oI05v74AYyo=";
  };

  meta = {
+2 −2
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@
}:
buildNpmPackage (finalAttrs: {
  pname = "claude-code";
  version = "2.0.5";
  version = "2.0.8";

  src = fetchzip {
    url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
    hash = "sha256-ZAolpT/NW48NpIoY2jUzbBlcHmyNcw+G1GhZ40qtJoY=";
    hash = "sha256-WxXkUZs/sQp7PJfSPCv8EwbvUGYgePhouKv/YFzOd14=";
  };

  npmDepsHash = "sha256-DehkeMZvzn+hvcCDzJfd4p9oYc1GSZm8gu8vKS4Uncw=";
+2 −2
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@

stdenvNoCC.mkDerivation rec {
  pname = "noto-fonts${suffix}";
  version = "2025.09.01";
  version = "2025.10.01";

  src = fetchFromGitHub {
    owner = "notofonts";
    repo = "notofonts.github.io";
    rev = "noto-monthly-release-${version}";
    hash = "sha256-E4k07z1tdUWKeFVLP1ZPqHlrZkXrBWYWGLEkAKnjk9Q=";
    hash = "sha256-SIF6G84sUvFSVatmZdF1zQve3pOYtlawJIXYFSW2srI=";
  };

  outputs = [
+2 −2
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@

stdenv.mkDerivation rec {
  pname = "vintagestory";
  version = "1.21.1";
  version = "1.21.2";

  src = fetchurl {
    url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
    hash = "sha256-6b0IXzTawRWdm2blOpMAIDqzzv/S7O3c+5k7xOhRFvI=";
    hash = "sha256-88EWU6u1UUuIcI789SyxlCaluUp6N0NJIlFpfSHNjyM=";
  };

  nativeBuildInputs = [
+6 −6
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
  stdenv,
  cmake,
  git,
  apple-sdk_11,
  apple-sdk_13,
  ninja,
  fetchFromGitHub,
  SDL2,
@@ -14,7 +14,7 @@
  nix-update-script,

  metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64,
  coreMLSupport ? stdenv.hostPlatform.isDarwin && false, # FIXME currently broken
  coreMLSupport ? stdenv.hostPlatform.isDarwin && true,

  config,
  cudaSupport ? config.cudaSupport,
@@ -47,7 +47,7 @@ let
    optionals
    ;

  darwinBuildInputs = [ apple-sdk_11 ];
  darwinBuildInputs = [ apple-sdk_13 ];

  cudaBuildInputs = with cudaPackages; [
    cuda_cccl # <nv/target>
@@ -73,13 +73,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
  pname = "whisper-cpp";
  version = "1.7.6";
  version = "1.8.0";

  src = fetchFromGitHub {
    owner = "ggml-org";
    repo = "whisper.cpp";
    tag = "v${finalAttrs.version}";
    hash = "sha256-dppBhiCS4C3ELw/Ckx5W0KOMUvOHUiisdZvkS7gkxj4=";
    hash = "sha256-6mEBhxZNAXu+Ya/jbI0G0tb6Wf5Wqz4KxPEZSrfsgv8=";
  };

  # The upstream download script tries to download the models to the
@@ -92,6 +92,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
    for target in examples/{bench,command,cli,quantize,server,stream,talk-llama}/CMakeLists.txt; do
      if ! grep -q -F 'install('; then
        echo 'install(TARGETS ''${TARGET} RUNTIME)' >> $target
        ${lib.optionalString stdenv.isDarwin "echo 'install(TARGETS whisper.coreml LIBRARY)' >> src/CMakeLists.txt"}
      fi
    done
  '';
@@ -183,7 +184,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
    license = lib.licenses.mit;
    mainProgram = "whisper-cli";
    platforms = lib.platforms.all;
    broken = coreMLSupport;
    badPlatforms = optionals cudaSupport lib.platforms.darwin;
    maintainers = with lib.maintainers; [
      dit7ya
Loading