Merge master into staging-next
This commit is contained in:
@@ -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 = {
|
||||
|
||||
@@ -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=";
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "c-blosc2";
|
||||
version = "2.21.1";
|
||||
version = "2.21.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Blosc";
|
||||
repo = "c-blosc2";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-Ra/LhLV78Gr2rXIKZIFx3+oJ+Fk03tfmguoGL4P9J5c=";
|
||||
sha256 = "sha256-jHp3l9sV5SiIOUjY2NUd5G+rH/8wr3TLZ+q/F8TAVhU=";
|
||||
};
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/144170
|
||||
|
||||
@@ -21,14 +21,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "narwhals";
|
||||
version = "2.4.0";
|
||||
version = "2.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "narwhals-dev";
|
||||
repo = "narwhals";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-ReF/6UNxxeQd4RspzmauEUJGaI1kY3hMPNYSDg8ZP2w=";
|
||||
hash = "sha256-peD5CLp5YCLPrOmXnoezT+gAJLf7zSb0xdhV+PhC/XI=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -905,6 +905,7 @@ let
|
||||
# Enable staging drivers. These are somewhat experimental, but
|
||||
# they generally don't hurt.
|
||||
STAGING = yes;
|
||||
STAGING_MEDIA = yes;
|
||||
};
|
||||
|
||||
proc-events = {
|
||||
|
||||
Reference in New Issue
Block a user