Merge master into staging-next
This commit is contained in:
@@ -570,22 +570,22 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"harbor": {
|
||||
"hash": "sha256-IxtPbdgjRpqN2ZRSLjtrl6sHrVAiQI+TkZboHsD/6qU=",
|
||||
"hash": "sha256-Z3lytylGY67wOajPPLqnmmhzxoJD1EfjSU0h3yg+kzY=",
|
||||
"homepage": "https://registry.terraform.io/providers/goharbor/harbor",
|
||||
"owner": "goharbor",
|
||||
"repo": "terraform-provider-harbor",
|
||||
"rev": "v3.11.0",
|
||||
"rev": "v3.11.2",
|
||||
"spdx": "MIT",
|
||||
"vendorHash": "sha256-UmlhKa2SVgrhRc1EOO9sEkherIS77CP+hkAL3Y79h3U="
|
||||
},
|
||||
"hcloud": {
|
||||
"hash": "sha256-O6GaMSL5E9t5v9nsRh7aGIXy/w04sCy7AYG4AvGsbLc=",
|
||||
"hash": "sha256-2IEi5YE7iXGmf1bKDZgswf5v5Hw9SdhSb1GxNzsm8qM=",
|
||||
"homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud",
|
||||
"owner": "hetznercloud",
|
||||
"repo": "terraform-provider-hcloud",
|
||||
"rev": "v1.52.0",
|
||||
"rev": "v1.53.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-pYetWQ7IIEvm2p9DoAh91W9atoCRgYDXCmthCiL5Vu0="
|
||||
"vendorHash": "sha256-vwuWz881nn901lAubv2xNCCIoNtyaVQJ77PM8E1LHjg="
|
||||
},
|
||||
"helm": {
|
||||
"hash": "sha256-i4ceWiEXJYL1x9DmqAfcUidiW5+x/sRCxevDz4MnzHs=",
|
||||
@@ -1318,11 +1318,11 @@
|
||||
"vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
|
||||
},
|
||||
"sysdig": {
|
||||
"hash": "sha256-KAwuE67gNOrDDLxgbxMtub0tMa45IiIOJ9Sq9mncK4c=",
|
||||
"hash": "sha256-C2jHcYSVdDyP42XyMleMmTYo5A+xDJuTVcE4LXHwFWk=",
|
||||
"homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
|
||||
"owner": "sysdiglabs",
|
||||
"repo": "terraform-provider-sysdig",
|
||||
"rev": "v1.59.0",
|
||||
"rev": "v1.60.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
|
||||
},
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "codeberg-cli";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "Aviac";
|
||||
repo = "codeberg-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eTr+vkHHbUnUIli7PDEb/1abr2z2m0AZK8sTrkADaqM=";
|
||||
hash = "sha256-81435dgw7fy4igUN3TYNjRans8uRZ/6TQWBxu0benwU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-/cPso8VGG7a1ODHLFMQ1Pyr6NA+7umY+Z2iCBJfIGdE=";
|
||||
cargoHash = "sha256-1E7UuDbJKrnhMQI6trk7nHkeywCPFg1021pQhRcb4kQ=";
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
|
||||
@@ -65,12 +65,12 @@
|
||||
let
|
||||
sources = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/72e0cee3/Feishu-linux_x64-7.46.12.deb";
|
||||
sha256 = "sha256-qdaWx4vQQWJtEX+3xo6oGp82sblsWb1jB96w8djc7wM=";
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/1d078929/Feishu-linux_x64-7.50.13.deb";
|
||||
sha256 = "sha256-wP3Uyz3KiWLADzUhZnPJori2gqdzEm5azUcGv8w1BXM=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/ea20b00e/Feishu-linux_arm64-7.46.12.deb";
|
||||
sha256 = "sha256-zh65+v9JWRv631hQDSnKwH1C8I35ddRpq8kcnhRe4wo=";
|
||||
url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/05ade0ea/Feishu-linux_arm64-7.50.13.deb";
|
||||
sha256 = "sha256-9YTk3Jx1Ap5ym2N/GiN8YcB6XfyVElSWZV3/O6gJWNE=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -133,7 +133,7 @@ let
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
version = "7.46.12";
|
||||
version = "7.50.13";
|
||||
pname = "feishu";
|
||||
|
||||
src =
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "lxgw-neoxihei";
|
||||
version = "1.220";
|
||||
version = "1.223";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
|
||||
hash = "sha256-rPZjNLysOYrOcGtDvXF3ok3bjtsN2/GDLWRRcXmq0zw=";
|
||||
hash = "sha256-mTfA4gHGtCKP7diimj9YzzEEQpXVdyYAXBezBEWiWHE=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -19,6 +19,8 @@ let
|
||||
hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8=";
|
||||
};
|
||||
});
|
||||
# pdm requires ...... -> ghostscript-with-X which is AGPL only
|
||||
matplotlib = super.matplotlib.override ({ enableTk = false; });
|
||||
# pdm requires ...... -> jbig2dec which is AGPL only
|
||||
moto = super.moto.overridePythonAttrs (old: rec {
|
||||
doCheck = false;
|
||||
@@ -28,7 +30,7 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "pdm";
|
||||
version = "2.25.5";
|
||||
version = "2.25.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python.pkgs.pythonOlder "3.8";
|
||||
@@ -37,7 +39,7 @@ python.pkgs.buildPythonApplication rec {
|
||||
owner = "pdm-project";
|
||||
repo = "pdm";
|
||||
tag = version;
|
||||
hash = "sha256-OXwtmcwRYRL9CZwAoJz9ID9oI3zz+5MkvU0vI5NjvEE=";
|
||||
hash = "sha256-Oq3xOxP6huK9sppum9SFoKUsEZNmXdTuuhhy1UqAk/Q=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "hishel" ];
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
php.buildComposerProject2 (finalAttrs: {
|
||||
pname = "phpunit";
|
||||
version = "12.3.11";
|
||||
version = "12.3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sebastianbergmann";
|
||||
repo = "phpunit";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-+vdiBJKdK+Wi12eCyD7MhKcZEhbqx7GoZ4H2CltM3B4=";
|
||||
hash = "sha256-nCN7tl2qiuJ/StMzly7stM/LWwnKH3Hx87u8CsO8ZD4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RmJaxC0tY6/1Z+LLhhMzDcaKHCKNjJug4vRlKwIqzPs=";
|
||||
vendorHash = "sha256-p/lNxm9EX2d2iNUaE8nSmvgB39LTNhJERhzfY08ayBU=";
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "roddhjav-apparmor-rules";
|
||||
version = "0-unstable-2025-09-14";
|
||||
version = "0-unstable-2025-09-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roddhjav";
|
||||
repo = "apparmor.d";
|
||||
rev = "6a77b7ed8b9683ebcaf92470b64cc33deca9b9d8";
|
||||
hash = "sha256-QMR/nTyXxGsMiwIf7RKtohM3pygPA8l9Jg+NLDac6+Y=";
|
||||
rev = "0ef6041dc38ccfd1c87699170518a56f03e1d9e6";
|
||||
hash = "sha256-iVf8mGN+q/a3ftuWqXp24MQ7Dr+V0JplA77IsfKFUGw=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
openssl,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "semtools";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "run-llama";
|
||||
repo = "semtools";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-wpOKEESM3uG9m/EqWnF2uXITbrwIhwe2MSA0FN7Fu+w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-irLhwlNnB3G63WUGV2wo+LQGQgNHYzu/vb/RM/G6Fdc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
checkFlags = lib.optionals (stdenv.hostPlatform.system == "x86_64-darwin") [
|
||||
# https://github.com/run-llama/semtools/issues/17
|
||||
"--skip=tests::test_search_result_context_calculation"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Semantic search and document parsing tools for the command line";
|
||||
homepage = "https://github.com/run-llama/semtools";
|
||||
changelog = "https://github.com/run-llama/semtools/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.amadejkastelic ];
|
||||
};
|
||||
})
|
||||
@@ -1,20 +1,20 @@
|
||||
{
|
||||
"aarch64-darwin": {
|
||||
"version": "1.12.6",
|
||||
"version": "1.12.11",
|
||||
"vscodeVersion": "1.99.3",
|
||||
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/9a3d24f8ef44e756d945e890becee97bc90c6482/Windsurf-darwin-arm64-1.12.6.zip",
|
||||
"sha256": "6a0fa684a90cdf052af6c76f78f1781a8f968f44f14101b12b67ccf8b37ebbe0"
|
||||
"url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/869df67af2a3134ce6fe3d8395ac0ae23726fd02/Windsurf-darwin-arm64-1.12.11.zip",
|
||||
"sha256": "1303ed86901099beac3ea6a8ac8ca532f238130b032153546252b852d8224d95"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"version": "1.12.6",
|
||||
"version": "1.12.11",
|
||||
"vscodeVersion": "1.99.3",
|
||||
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/9a3d24f8ef44e756d945e890becee97bc90c6482/Windsurf-darwin-x64-1.12.6.zip",
|
||||
"sha256": "df9c668f5716905c43e97c066b94b7a4c0ad1932072e83c385f99cffa9b878b1"
|
||||
"url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/869df67af2a3134ce6fe3d8395ac0ae23726fd02/Windsurf-darwin-x64-1.12.11.zip",
|
||||
"sha256": "6a0898186f68125c9f1310f8c2e6867f3e54ab6a72e1295799da1bd607af4825"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"version": "1.12.6",
|
||||
"version": "1.12.11",
|
||||
"vscodeVersion": "1.99.3",
|
||||
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/9a3d24f8ef44e756d945e890becee97bc90c6482/Windsurf-linux-x64-1.12.6.tar.gz",
|
||||
"sha256": "fed4da2979aac3978cca4ed493af5fa15489417f03072fd8c283855b223861be"
|
||||
"url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/869df67af2a3134ce6fe3d8395ac0ae23726fd02/Windsurf-linux-x64-1.12.11.tar.gz",
|
||||
"sha256": "421a27f73c84a6f52bba3cfdc9edd9ea055013ba9c85bdd0777b072ab382637c"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
}:
|
||||
llvmPackages_20.stdenv.mkDerivation {
|
||||
pname = "xenia-canary";
|
||||
version = "0-unstable-2025-09-14";
|
||||
version = "0-unstable-2025-09-27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xenia-canary";
|
||||
repo = "xenia-canary";
|
||||
fetchSubmodules = true;
|
||||
rev = "8d03766d039569e36539d19283ed14c5c2683b8d";
|
||||
hash = "sha256-sWZQUFR3emQ7lWXxbZZqWyDzto0bfOFO3d1zgVCiFvM=";
|
||||
rev = "41b412fa76f2fc4d913af0b74a68208616f205ce";
|
||||
hash = "sha256-Q6Y1aV45wKeutvuiovEtb2Csqzx38gQelHky3EKx2BM=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
@@ -1,32 +1,34 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
versioningit,
|
||||
numpy,
|
||||
scipy,
|
||||
h5py,
|
||||
dill,
|
||||
matplotlib,
|
||||
blinker,
|
||||
aiohttp,
|
||||
python,
|
||||
blinker,
|
||||
buildPythonPackage,
|
||||
cloudpickle,
|
||||
dill,
|
||||
fetchPypi,
|
||||
h5py,
|
||||
matplotlib,
|
||||
msgpack,
|
||||
numpy,
|
||||
plotly,
|
||||
python-socketio,
|
||||
python,
|
||||
pythonOlder,
|
||||
scipy,
|
||||
setuptools,
|
||||
versioningit,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bumps";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YfnBA1rCD05B4XOS611qgi4ab3xKoYs108mwhj/I+sg=";
|
||||
hash = "sha256-O5GUoyDlB0X2Z/O3JprN3omoOBDIhv0xrKfUSHTgGpM=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
@@ -39,16 +41,18 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
numpy
|
||||
scipy
|
||||
h5py
|
||||
dill
|
||||
matplotlib
|
||||
blinker
|
||||
aiohttp
|
||||
python
|
||||
blinker
|
||||
cloudpickle
|
||||
dill
|
||||
h5py
|
||||
matplotlib
|
||||
msgpack
|
||||
numpy
|
||||
plotly
|
||||
python
|
||||
python-socketio
|
||||
scipy
|
||||
# mpld3 # not packaged
|
||||
];
|
||||
|
||||
|
||||
@@ -1,46 +1,47 @@
|
||||
{
|
||||
lib,
|
||||
annexremote,
|
||||
buildPythonPackage,
|
||||
datalad,
|
||||
datasalad,
|
||||
distutils,
|
||||
fetchFromGitHub,
|
||||
git-annex,
|
||||
git,
|
||||
hatch-vcs,
|
||||
hatchling,
|
||||
humanize,
|
||||
lib,
|
||||
more-itertools,
|
||||
openssh,
|
||||
psutil,
|
||||
pytestCheckHook,
|
||||
pythonAtLeast,
|
||||
setuptools,
|
||||
requests-toolbelt,
|
||||
requests,
|
||||
unzip,
|
||||
versioneer,
|
||||
webdavclient3,
|
||||
writableTmpDirAsHomeHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datalad-next";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0-unstable-2025-07-04";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datalad";
|
||||
repo = "datalad-next";
|
||||
tag = version;
|
||||
hash = "sha256-fqP6nG2ncDRg48kvlsmPjNBOzfQp9+7wTcGvsYVrRzA=";
|
||||
rev = "2d2b1526c1e396964dd3ffdbb37597adefe7682d";
|
||||
hash = "sha256-47cRxaxOGzR6hDfiW2hS3MNHp2aP9rxtWNxV+33PPfs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Remove vendorized versioneer.py
|
||||
rm versioneer.py
|
||||
'';
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = "1.6.0";
|
||||
|
||||
nativeBuildInputs = [ git ];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
versioneer
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
@@ -51,18 +52,22 @@ buildPythonPackage rec {
|
||||
more-itertools
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
optional-dependencies = {
|
||||
httpsupport = [
|
||||
requests
|
||||
requests-toolbelt
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
webdavclient3
|
||||
psutil
|
||||
git-annex
|
||||
datalad
|
||||
git-annex
|
||||
openssh
|
||||
psutil
|
||||
pytestCheckHook
|
||||
unzip
|
||||
webdavclient3
|
||||
writableTmpDirAsHomeHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
@@ -89,14 +94,16 @@ buildPythonPackage rec {
|
||||
# hardcoded /bin path
|
||||
"test_auto_if_wanted_data_transfer_path_restriction"
|
||||
|
||||
# requires internet access
|
||||
"test_push_wanted"
|
||||
# Test require internet access
|
||||
"test_auto_data_transfer"
|
||||
"test_http_url_operations"
|
||||
"test_transparent_decompression"
|
||||
"test_compressed_file_stay_compressed"
|
||||
"test_ls_file_collection_tarfile"
|
||||
"test_delete_method"
|
||||
"test_delete_timeout"
|
||||
"test_http_url_operations"
|
||||
"test_iter_tar"
|
||||
"test_ls_file_collection_tarfile"
|
||||
"test_push_wanted"
|
||||
"test_transparent_decompression"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.13") [
|
||||
# RuntimeError
|
||||
@@ -104,7 +111,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# requires internet access
|
||||
# Tests require internet access
|
||||
"datalad_next/commands/tests/test_download.py"
|
||||
"datalad_next/archive_operations/tests/test_tarfile.py"
|
||||
];
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datasalad";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "datalad";
|
||||
repo = "datasalad";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-v0qq9uzO2nD2RZ9LlmBzs3OOAriylrq9mcmgpDga4gw=";
|
||||
hash = "sha256-w00QY6oz0FgfgdY3f+mVRRnsOT0WJZV64ymgsXAINac=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -8,26 +8,20 @@
|
||||
setuptools,
|
||||
|
||||
# dependencies
|
||||
diskcache,
|
||||
guidance-stitch,
|
||||
jinja2,
|
||||
llguidance,
|
||||
numpy,
|
||||
ordered-set,
|
||||
platformdirs,
|
||||
psutil,
|
||||
pydantic,
|
||||
referencing,
|
||||
requests,
|
||||
tiktoken,
|
||||
|
||||
# optional-dependencies
|
||||
openai,
|
||||
jsonschema,
|
||||
fastapi,
|
||||
uvicorn,
|
||||
|
||||
# tests
|
||||
huggingface-hub,
|
||||
jsonschema,
|
||||
pytestCheckHook,
|
||||
tokenizers,
|
||||
torch,
|
||||
@@ -36,14 +30,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "guidance";
|
||||
version = "0.2.5";
|
||||
version = "0.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guidance-ai";
|
||||
repo = "guidance";
|
||||
tag = version;
|
||||
hash = "sha256-dTMJOBGirEumbpTanCVZQJATfLxqxmpUCqE7pah97Zw=";
|
||||
hash = "sha256-ZKHCnLGZdpr/R+vu7crijnKUFc+LMMxIdN9f6hYL7dk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -56,37 +50,31 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
diskcache
|
||||
guidance-stitch
|
||||
jinja2
|
||||
llguidance
|
||||
numpy
|
||||
ordered-set
|
||||
platformdirs
|
||||
psutil
|
||||
pydantic
|
||||
referencing
|
||||
requests
|
||||
tiktoken
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
azureai = [ openai ];
|
||||
openai = [ openai ];
|
||||
schemas = [ jsonschema ];
|
||||
server = [
|
||||
fastapi
|
||||
uvicorn
|
||||
azureai = [
|
||||
# azure-ai-inference
|
||||
openai
|
||||
];
|
||||
openai = [ openai ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
huggingface-hub
|
||||
jsonschema
|
||||
pytestCheckHook
|
||||
tokenizers
|
||||
torch
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ optional-dependencies.schemas;
|
||||
];
|
||||
|
||||
enabledTestPaths = [ "tests/unit" ];
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-ollama";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_ollama";
|
||||
inherit version;
|
||||
hash = "sha256-Zkofjv6tyoKGyqL/lBimv662yExLsvm4IRzu2ewIPi4=";
|
||||
hash = "sha256-AG2/QHpr9JYS0/8loXhw2QTYg9MSerFjRguJ0WUlDKI=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -18,29 +18,31 @@ let
|
||||
owner = "nanomsg";
|
||||
repo = "nng";
|
||||
tag = "v1.6.0";
|
||||
sha256 = "sha256-Kq8QxPU6SiTk0Ev2IJoktSPjVOlAS4/e1PQvw2+e8UA=";
|
||||
hash = "sha256-Kq8QxPU6SiTk0Ev2IJoktSPjVOlAS4/e1PQvw2+e8UA=";
|
||||
};
|
||||
|
||||
mbedtls = fetchFromGitHub {
|
||||
owner = "ARMmbed";
|
||||
repo = "mbedtls";
|
||||
tag = "v3.5.1";
|
||||
sha256 = "sha256-HxsHcGbSExp1aG5yMR/J3kPL4zqnmNoN5T5wfV3APaw=";
|
||||
hash = "sha256-HxsHcGbSExp1aG5yMR/J3kPL4zqnmNoN5T5wfV3APaw=";
|
||||
};
|
||||
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "pynng";
|
||||
version = "0.8.1-unstable-2025-05-14";
|
||||
format = "pyproject";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "codypiersall";
|
||||
repo = "pynng";
|
||||
rev = "2179328f8a858bbb3e177f66ac132bde4a5aa859";
|
||||
sha256 = "sha256-TxIVcqc+4bro+krc1AWgLdZKGGuQ2D6kybHnv5z1oHg=";
|
||||
hash = "sha256-TxIVcqc+4bro+krc1AWgLdZKGGuQ2D6kybHnv5z1oHg=";
|
||||
};
|
||||
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.8.1";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
@@ -69,9 +71,7 @@ buildPythonPackage {
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pynng"
|
||||
];
|
||||
pythonImportsCheck = [ "pynng" ];
|
||||
|
||||
meta = {
|
||||
description = "Python bindings for Nanomsg Next Generation";
|
||||
|
||||
@@ -45,6 +45,10 @@ buildPythonPackage rec {
|
||||
rm src/pyfx/model/common/jsonpath/*.py # upstream checks in generated files, remove to ensure they were regenerated
|
||||
antlr -Dlanguage=Python3 -visitor src/pyfx/model/common/jsonpath/*.g4
|
||||
rm src/pyfx/model/common/jsonpath/*.{g4,interp,tokens} # no need to install
|
||||
|
||||
# https://github.com/cielong/pyfx/pull/148
|
||||
substituteInPlace src/pyfx/view/common/frame.py \
|
||||
--replace-fail "self.__super.__init__()" "super().__init__()"
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -6,21 +6,18 @@
|
||||
poetry-core,
|
||||
prompt-toolkit,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "questionary";
|
||||
version = "2.1.0";
|
||||
version = "2.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmbo";
|
||||
repo = "questionary";
|
||||
tag = version;
|
||||
hash = "sha256-HiQsOkG3oK+hnyeFjebnVASxpZhUPGBGz69JvPO43fM=";
|
||||
hash = "sha256-r7F5y6KD6zonQGtO/9OuCTMTWdkCdd9aqTgKg6eWp08=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "prompt_toolkit" ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.15.0";
|
||||
version = "0.15.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
tag = version;
|
||||
hash = "sha256-H41RDce8LRm4z8JjhHjUBC4a0aMG2Kca4fi6YGvi7Yk=";
|
||||
hash = "sha256-ySA+OHLY1whrZjWVrbcP3cabEpF02Mjf/AFqy5NXchs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -2,26 +2,26 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitLab,
|
||||
requests,
|
||||
poetry-core,
|
||||
hatchling,
|
||||
pytestCheckHook,
|
||||
requests,
|
||||
urllib3,
|
||||
waitress,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "requests-unixsocket2";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "thelabnyc";
|
||||
repo = "requests-unixsocket2";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HD68YczUy7bexm3Rrh0OfgOux3ItSYQB9lj68p7WtnU=";
|
||||
hash = "sha256-KgPIecKQibB5ZH+itw3OM9heSE3uDuodNS1R9dRkaHE=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
requests
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rfc3161-client";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trailofbits";
|
||||
repo = "rfc3161-client";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/+vKpd7wLFa7BgczzI27fLykxq5q4q1PC3QpoAO2E7M=";
|
||||
hash = "sha256-EF4d9MnBhWt99vy2MOK+u0aUQ3ZEH/8mYezlWQtGvhU=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "streamlit";
|
||||
version = "1.49.1";
|
||||
version = "1.50.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-byE/HkPwNRQ6VvWK1QBo2KCUgvCi2tEFDX5+malomBg=";
|
||||
hash = "sha256-hyIdVoqsWFJ0oF7xijeLA98zK5PggQP//PPNhNhSr0Y=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -65,5 +65,9 @@ buildPythonPackage rec {
|
||||
changelog = "https://github.com/onnx/tensorflow-onnx/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ happysalada ];
|
||||
badPlatforms = [
|
||||
# Segmentation fault on darwin
|
||||
lib.systems.inspect.patterns.isDarwin
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "truststore";
|
||||
version = "0.10.1";
|
||||
version = "0.10.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "sethmlarson";
|
||||
repo = "truststore";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oVFNR8qxEmCZdTGqzb9Gj3XIUwPy6YWV3YJPkIDA8Cw=";
|
||||
hash = "sha256-EbwD2YyVA9W9cWEjYvypBJxs6Hbkb/tF2qU/sUNCt5g=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
Reference in New Issue
Block a user