Merge staging-next into staging
This commit is contained in:
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "calva";
|
||||
publisher = "betterthantomorrow";
|
||||
version = "2.0.519";
|
||||
hash = "sha256-Ndgps72L1mT7a2xoBmeXm/iAbyFMXP+e8SuQ5Q7HqcI=";
|
||||
version = "2.0.520";
|
||||
hash = "sha256-OU/GZgTGVr+ZMhebMhAK0VDRm/qj+NLXOwc6FekjbgQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3936,8 +3936,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "prisma";
|
||||
publisher = "Prisma";
|
||||
version = "6.10.1";
|
||||
hash = "sha256-3Qx5HAkRnxByRHyX99PIRlHwI7FeenVcK8v9T+d5++4=";
|
||||
version = "6.11.1";
|
||||
hash = "sha256-ev99UhjYYu0aozidnuy30sBSyeQiTFdzMjc3piIBscQ=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
|
||||
|
||||
+4
-4
@@ -6,13 +6,13 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"@anthropic-ai/claude-code": "^1.0.41"
|
||||
"@anthropic-ai/claude-code": "^1.0.43"
|
||||
}
|
||||
},
|
||||
"node_modules/@anthropic-ai/claude-code": {
|
||||
"version": "1.0.41",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.41.tgz",
|
||||
"integrity": "sha512-6E5SCb1I/pC4WCEFGwmyo4M4bL9vBuk7qkC78v9ZFX9PAxmKX94SEj422igdLeucBYX99ZqKSMYfsJEqTeIo2Q==",
|
||||
"version": "1.0.43",
|
||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-1.0.43.tgz",
|
||||
"integrity": "sha512-VnuRK4s/R9ZRTkwH4gUjsp4SiBQXq7Y0B47OtgeXIZYVQYkhTW8m+E0IisFzXXFIyTQrE0SodGCpvgLhAYzGCg==",
|
||||
"hasInstallScript": true,
|
||||
"license": "SEE LICENSE IN README.md",
|
||||
"bin": {
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "claude-code";
|
||||
version = "1.0.41";
|
||||
version = "1.0.43";
|
||||
|
||||
nodejs = nodejs_20; # required for sandboxed Nix builds on Darwin
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${version}.tgz";
|
||||
hash = "sha256-x8Bxh0iKqf8AsMQ+7zutSh53DbCRzM9s6s6BQkdbyXc=";
|
||||
hash = "sha256-MPnctLow88Muzd9h5c6w/u0tO4Umrl6YJcp/1/BTFD4=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-LiCN8swT4ba+F1aMjHQqCsZUqcAW0qc4AiYL90Burk8=";
|
||||
npmDepsHash = "sha256-jwT+W/oithQ0AHpFmmD3E6XIBZ5VdCHz61RstOhVFHQ=";
|
||||
|
||||
postPatch = ''
|
||||
cp ${./package-lock.json} package-lock.json
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ignition";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flattool";
|
||||
repo = "ignition";
|
||||
tag = finalAttrs.version;
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-T0bVMJnJPpKdS5T6rPxVAEvIXFNSj5BtypaexSJhl2I=";
|
||||
hash = "sha256-BqlzxrsbukfkwRIUTN5eaJPRC/dWSWUieDKIqnePZl4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -2,32 +2,23 @@
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
nix-update-script,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "mongosh";
|
||||
version = "2.5.2";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb-js";
|
||||
repo = "mongosh";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-0rol41XNdpfVRGY8KXFmQ0GHg5QqgnCaF21ZFyxfKeQ=";
|
||||
hash = "sha256-dngguv/ShxwfFpbYyyfJ1SmQhSgEsDOKcRSXdjsfcmo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-J4/CU+gdT/qecM1JwafLBewQjYdaONq/k4ax3Jw34XY=";
|
||||
npmDepsHash = "sha256-W5qq3XUV+x0Ko1Ftp2JTHbaOSGsSG5a7qABthtnaU4o=";
|
||||
|
||||
patches = [
|
||||
./disable-telemetry.patch
|
||||
|
||||
# For tagged version 2.5.2
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mongodb-js/mongosh/commit/8e775b58b95f1d7c0a3de9c677e957a40213da6a.patch";
|
||||
hash = "sha256-Q80QuzC7JN6uqyjk7YuUljXm+365AwYRV5cct9TefUc=";
|
||||
})
|
||||
];
|
||||
|
||||
npmFlags = [
|
||||
@@ -45,15 +36,9 @@ buildNpmPackage (finalAttrs: {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
tests.version = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
};
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"^v(\\d+\\.\\d+\\.\\d+)$"
|
||||
];
|
||||
};
|
||||
# Version testing is skipped because upstream often forgets to update the version.
|
||||
|
||||
updateScript = ./update.sh;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
Executable
+8
@@ -0,0 +1,8 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl nix-update jq
|
||||
|
||||
# GitHub tags include many unrelated subpackage versions, making it unreliable to determine the latest mongosh version.
|
||||
# Fetch the latest mongosh version directly from the npm registry instead.
|
||||
version="$(curl -fsSL https://registry.npmjs.org/mongosh/latest | jq -r ".version")"
|
||||
|
||||
nix-update --version "$version" mongosh
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGo124Module (finalAttrs: {
|
||||
pname = "traefik";
|
||||
version = "3.4.1";
|
||||
version = "3.4.3";
|
||||
|
||||
# Archive with static assets for webui
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-cE4Pivu1wUZqd1i+aYZqirNQse1ExgEV6550CawRwJM=";
|
||||
hash = "sha256-fxFr0PRKMYf5KpyFUoEv4TEJBmwTr1s5CRAZyHAgfqM=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eaeuTYjwv4Pa48YZ2yDOIRDRrSSw6fNhJIN8imV5dNM=";
|
||||
vendorHash = "sha256-nh5l71iRnT32mceeS7slksP3hjQP4hO4AKIvlO+CYMQ=";
|
||||
|
||||
subPackages = [ "cmd/traefik" ];
|
||||
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasm-language-tools";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "g-plane";
|
||||
repo = "wasm-language-tools";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-JNrDPqBpZW1FI+JcdNHEp4yWp30wbFGmtdGWBa8PyOQ=";
|
||||
hash = "sha256-FjBRz2vAc5qmOeuDiqn8WkMqJmkeyrZDcJ2FoOaR2PY=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-Vrd5Iv4KTXNmcKDTk9i1diSFhmampncELEGckmwsf3o=";
|
||||
cargoHash = "sha256-a3bLXdKCXWH7bSmU6G5X9vHOPaBkn/EUG894BB8/dHs=";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/wat_server";
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
rev = "1.2.0";
|
||||
rev = "1.2.1";
|
||||
in
|
||||
buildDotnetModule rec {
|
||||
pname = "XIVLauncher";
|
||||
@@ -27,7 +27,7 @@ buildDotnetModule rec {
|
||||
owner = "goatcorp";
|
||||
repo = "XIVLauncher.Core";
|
||||
inherit rev;
|
||||
hash = "sha256-2ZL3giUrc4mUNh8rr+yI+k2Sx5rZsoFGR1ZBlTugH6M=";
|
||||
hash = "sha256-bGHUDPUrohcc/lLE647cicaEIYo9t1/anc2VeMJlsGc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule {
|
||||
pname = "zoekt";
|
||||
version = "3.7.2-2-unstable-2025-06-26";
|
||||
version = "3.7.2-2-unstable-2025-06-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sourcegraph";
|
||||
repo = "zoekt";
|
||||
rev = "bf9caa2750947b52df419fb4dd3d0ab000bd182f";
|
||||
hash = "sha256-5LuKn3GjtUk7tJE2uxjuDU1kTiRDzc9KruJbzg6DKCI=";
|
||||
rev = "7ffb936f26b187de0f9e021993b82ff2196c0368";
|
||||
hash = "sha256-chIY56m0sagwMJIeoFLNlAINHuBtzIm8PfJ/z4A/L6k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-1WfQbvT5pKZRfs2DWv6+jBpHKGpcxhYAnc+NXvMT6WE=";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
|
||||
@@ -101,23 +102,28 @@ buildPythonPackage rec {
|
||||
"test_trainer_multi_dataset_errors"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests require network access
|
||||
"tests/cross_encoder/test_cross_encoder.py"
|
||||
"tests/cross_encoder/test_train_stsb.py"
|
||||
"tests/evaluation/test_information_retrieval_evaluator.py"
|
||||
"tests/sparse_encoder/models/test_csr.py"
|
||||
"tests/sparse_encoder/models/test_sparse_static_embedding.py"
|
||||
"tests/sparse_encoder/test_opensearch_models.py"
|
||||
"tests/sparse_encoder/test_pretrained.py"
|
||||
"tests/sparse_encoder/test_sparse_encoder.py"
|
||||
"tests/test_compute_embeddings.py"
|
||||
"tests/test_model_card_data.py"
|
||||
"tests/test_multi_process.py"
|
||||
"tests/test_pretrained_stsb.py"
|
||||
"tests/test_sentence_transformer.py"
|
||||
"tests/test_train_stsb.py"
|
||||
];
|
||||
disabledTestPaths =
|
||||
[
|
||||
# Tests require network access
|
||||
"tests/cross_encoder/test_cross_encoder.py"
|
||||
"tests/cross_encoder/test_train_stsb.py"
|
||||
"tests/evaluation/test_information_retrieval_evaluator.py"
|
||||
"tests/sparse_encoder/models/test_csr.py"
|
||||
"tests/sparse_encoder/models/test_sparse_static_embedding.py"
|
||||
"tests/sparse_encoder/test_opensearch_models.py"
|
||||
"tests/sparse_encoder/test_pretrained.py"
|
||||
"tests/sparse_encoder/test_sparse_encoder.py"
|
||||
"tests/test_compute_embeddings.py"
|
||||
"tests/test_model_card_data.py"
|
||||
"tests/test_multi_process.py"
|
||||
"tests/test_pretrained_stsb.py"
|
||||
"tests/test_sentence_transformer.py"
|
||||
"tests/test_train_stsb.py"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Segfault
|
||||
"tests/test_sparse_tensor.py"
|
||||
];
|
||||
|
||||
# Sentence-transformer needs a writable hf_home cache
|
||||
postInstall = ''
|
||||
|
||||
@@ -23,6 +23,8 @@ buildPythonPackage rec {
|
||||
hash = "sha256-oiXIxNvedEk+EufYzxhvRr8m+kuQRs0J62Yel5JLenQ=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "beautifulsoup4" ];
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
@@ -39,7 +41,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python module to extract details from personal pages";
|
||||
homepage = "https://github.com/soxoj/socid-extractor";
|
||||
changelog = "https://github.com/soxoj/socid-extractor/blob/v${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/soxoj/socid-extractor/blob/v${src.tag}/CHANGELOG.md";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "socid_extractor";
|
||||
|
||||
Reference in New Issue
Block a user