mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
GitHub
commit
de5f8585f0
39 changed files with 636 additions and 183 deletions
|
|
@ -14454,6 +14454,13 @@
|
|||
githubId = 7587245;
|
||||
name = "Kit Langton";
|
||||
};
|
||||
Kitsune = {
|
||||
name = "Lunae V";
|
||||
github = "KitsuneDev";
|
||||
githubId = 11809449;
|
||||
email = "kitsune@akitsune.dev";
|
||||
matrix = "@kitsune:akitsune.dev";
|
||||
};
|
||||
kitsunoff = {
|
||||
github = "kitsunoff";
|
||||
githubId = 58953114;
|
||||
|
|
|
|||
|
|
@ -21,9 +21,9 @@ let
|
|||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.10/android-studio-quail1-patch2-linux.tar.gz";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2026.1.1.7"; # "Android Studio Quail 1 | 2026.1.1 RC 2"
|
||||
sha256Hash = "sha256-TB9hPynvVq1axv6oAw8un6WHVHakZPvEBjfPCs+Dwj0=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.7/android-studio-quail1-rc2-linux.tar.gz";
|
||||
version = "2026.1.2.8"; # "Android Studio Quail 2 | 2026.1.2 RC 1"
|
||||
sha256Hash = "sha256-tTMD3wgEg0W7WsJb/hWXMdzqNDD04uJ7imAzgWG9Jmc=";
|
||||
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.8/android-studio-quail2-rc1-linux.tar.gz";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2026.1.3.1"; # "Android Studio Quail 3 | 2026.1.3 Canary 1"
|
||||
|
|
|
|||
|
|
@ -319,11 +319,11 @@
|
|||
"vendorHash": null
|
||||
},
|
||||
"digitalocean_digitalocean": {
|
||||
"hash": "sha256-gvLdDUFg8WoBg8+351CCK84LhLJlsV6Nqm9kbxlQQ50=",
|
||||
"hash": "sha256-SguubBNjYqWuxeYkCKoPAK3Vvdv8wdBJfnvySwBQt8c=",
|
||||
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
|
||||
"owner": "digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.89.0",
|
||||
"rev": "v2.91.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
|
|
@ -517,13 +517,13 @@
|
|||
"vendorHash": "sha256-Msl/Mn0GK3D+QyLnSFU3m9ux/ThkwDCDh85b0Yzpnjo="
|
||||
},
|
||||
"hashicorp_awscc": {
|
||||
"hash": "sha256-/4NhHZs/8LwrL+TXoOGyszvHZcKps5tDu7uewKeNmb4=",
|
||||
"hash": "sha256-ZQaBYZTsF68IjbRYa3Z7VRqKfaHCvOtMkJHsybJn+ec=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-awscc",
|
||||
"rev": "v1.88.0",
|
||||
"rev": "v1.89.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-vTJI/71O8u6DqAF3E7pde1Z1qsoyTTJMNen3AvRomls="
|
||||
"vendorHash": "sha256-9FzpBgb3BzIVhx8kqhyDJw/liH6X8jUhFmwtbic4uVw="
|
||||
},
|
||||
"hashicorp_azuread": {
|
||||
"hash": "sha256-BkQwLkGu8Xmb4laoXOLDbSPyya5v8HBBNIya5hUBlV8=",
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "amneziawg-go";
|
||||
version = "0.2.18";
|
||||
version = "0.2.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amnezia-vpn";
|
||||
repo = "amneziawg-go";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zuP8j3Khw8RbpBlJxoKmTAm3V8Y+c2aL4dNuRIrxWjU=";
|
||||
hash = "sha256-3Uy/zsdmNpcOpohwewPbSNBOzLpyV+zoTdZJJm7XxKI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ let
|
|||
|
||||
pkg = buildGoModule (finalAttrs: {
|
||||
pname = "arduino-cli";
|
||||
version = "1.4.1";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arduino";
|
||||
repo = "arduino-cli";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2m0V7yj6C7Lvlu9RaM54pbGKSwrek6WYuwH1yqYHdB0=";
|
||||
hash = "sha256-MZX6ERZwmfiJMqx6mQ0qAfv1dbXunTYHRbdzyoinOJY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -31,7 +31,7 @@ let
|
|||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-5bkaHEzQ2gLV1epkScbCf1qv5XeuewLwqNcpPCSdbh4=";
|
||||
vendorHash = "sha256-j5SpZnBWcC8K8lHgc5HOCbGD3DdHr9tVtEhXWTCCogk=";
|
||||
|
||||
postPatch =
|
||||
let
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "argocd";
|
||||
version = "3.3.6";
|
||||
version = "3.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-84GlX9m1+Af9EPPdvLJcZIqhw7a1DBj1xKmUpNnngbk=";
|
||||
hash = "sha256-I3udVhmPpOA2Lf1mkJqG+d+mGpfM16HIKBkEnTiAw0c=";
|
||||
};
|
||||
|
||||
ui = stdenv.mkDerivation {
|
||||
|
|
@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
|||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/ui/yarn.lock";
|
||||
hash = "sha256-kqBolkQiwZUBic0f+Ek5HwYsOmro1+FStkDLXAre79o=";
|
||||
hash = "sha256-/B7FviD0a3VDmbbM59Ksmr8apuTRHrRbTtfX4QgO8JM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -45,7 +45,7 @@ buildGoModule (finalAttrs: {
|
|||
};
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-ABhvLf1wZm/2WdkzMOBBK/mycSjX+6/kKc0VcUhxvok=";
|
||||
vendorHash = "sha256-w6jFNWKvcwxyeiSy+Pqb43qOfMOXF5UHr2VpyQD2dFw=";
|
||||
|
||||
# Set target as ./cmd per cli-local
|
||||
# https://github.com/argoproj/argo-cd/blob/master/Makefile
|
||||
|
|
|
|||
|
|
@ -18,13 +18,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "attyx";
|
||||
version = "0.4.5";
|
||||
version = "0.4.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "semos-labs";
|
||||
repo = "attyx";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-9/Zl6IrgrT8vHYllCKb977Ar5QRYQiXDmK/g+4YWcqM=";
|
||||
hash = "sha256-lxQR8oAXH+S78jklmOsJO16i//iw0vsxjwN49Vxmb4k=";
|
||||
};
|
||||
|
||||
deps = callPackage ./build.zig.zon.nix { };
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "beadwork";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jallum";
|
||||
repo = "beadwork";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-NlmnoFz4gYIB3g3C/7rmgKhUkh8q/Vn1drhHIuUScTg=";
|
||||
hash = "sha256-OVwr/AUIx6k5QF2rZf25BWD+3UHYqN8tziJTa8tgDYU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-LjqZSI7F3C8GyNrPK/BwG9QTmNg89hFAvhUuBjmbHTU=";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Generated by ./update.sh - do not update manually!
|
||||
{
|
||||
version = "1.17.6-2";
|
||||
arm64-hash = "sha256-uJjVcwkbYiTdV9Ki/ur1/xZuKUCUFefRXIPSRlgRaoA=";
|
||||
x86_64-hash = "sha256-vAKAYCbwS92Nqk0W+dN/GeYOcori4MY5e16mMDLfXPk=";
|
||||
version = "1.17.9-1";
|
||||
arm64-hash = "sha256-xTRGaplSpW+ax7/hJHxGq/8W3vbJF0uYbXsW1Dl04Bk=";
|
||||
x86_64-hash = "sha256-ek7XkwWBr6dx7lV9xy/+Sl4INEbSu5g/WaPEHU4FGH4=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,19 +8,19 @@
|
|||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "carapace-bridge";
|
||||
version = "1.5.3";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carapace-sh";
|
||||
repo = "carapace-bridge";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-URIRdoG/P6YrcuOdZmQHD1cvcpYg++JS39fj/wJdLWY=";
|
||||
hash = "sha256-HEVFg9rW1UiRpcZlENTg+YgB/AwmtuEuNqTf4jXW4wU=";
|
||||
};
|
||||
|
||||
# buildGoModule tries to run `go mod vendor` instead of `go work vendor` on
|
||||
# the workspace if proxyVendor is off
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-1TTo5Maka7lp20ZC7/Sebt+/stUQSheRXrEuhykbLN0=";
|
||||
vendorHash = "sha256-RLx5QtA3oTsDSmSWoRqV0LJ+rSifSRc+WAQyeh0Xnbw=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmd/carapace-bridge/main.go \
|
||||
|
|
|
|||
|
|
@ -21,16 +21,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "halloy";
|
||||
version = "2026.7.1";
|
||||
version = "2026.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "squidowl";
|
||||
repo = "halloy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-AFDx4gmYWUMcvpJi+/2xd0s4gAygwss2XrmCFsd6uKs=";
|
||||
hash = "sha256-+qFHwlwRxVN4W9DG+gY5N6um+JARD+3EiLlsD7R9Tpc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-hrYWF5WNhLqKMFJJlir7tumxNZqgGm+gK+RI1iDPatM=";
|
||||
cargoHash = "sha256-/nFtOJXpusIlc7orGv013qzad8fdfQr32c8DAlccHIA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
# keep-sorted start
|
||||
cpptrace,
|
||||
fast-float,
|
||||
fmt,
|
||||
gtest,
|
||||
hat-trie,
|
||||
|
|
@ -83,8 +84,8 @@ let
|
|||
luajit-src = fetchFromGitHub {
|
||||
owner = "RocksLabs";
|
||||
repo = "LuaJIT";
|
||||
rev = "c0a8e68325ec261a77bde1c8eabad398168ffe74";
|
||||
hash = "sha256-Wjh14d0JR5ecAwdYVBjQYIHb2vJ1I61oR0N0LMmtq4E=";
|
||||
rev = "02dfcc34e93e57ac96e566d123c66ee01e650299";
|
||||
hash = "sha256-HINP9nahXHTManDMAAJBOUlSSxv5JZhlHs96HHkE7qE=";
|
||||
};
|
||||
|
||||
zlib-ng' = zlib-ng.override { withZlibCompat = true; };
|
||||
|
|
@ -107,13 +108,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kvrocks";
|
||||
version = "2.15.0";
|
||||
version = "2.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "kvrocks";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s4saKuezPYvcmKSqVBVDbPJcQXr6pVfIWjff7Txg8tY=";
|
||||
hash = "sha256-CAbhOX7dmyXgl0STNjzALseXUzrpTPNy9tjoPACe0Os=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
|
@ -151,6 +152,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
];
|
||||
}}
|
||||
${mkCmakeFile "fmt" { findPackage = "fmt"; }}
|
||||
${mkCmakeFile "fast_float" {
|
||||
findPackage = "FastFloat";
|
||||
libraries = [
|
||||
{
|
||||
name = "fast_float";
|
||||
target = "FastFloat::fast_float";
|
||||
}
|
||||
];
|
||||
}}
|
||||
${mkCmakeFile "spdlog" { findPackage = "spdlog"; }}
|
||||
${mkCmakeFile "snappy" {
|
||||
pkgConfig = {
|
||||
|
|
@ -273,6 +283,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
buildInputs = [
|
||||
# keep-sorted start
|
||||
cpptrace
|
||||
fast-float
|
||||
fmt
|
||||
gtest
|
||||
hat-trie
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "mapproxy";
|
||||
version = "6.0.1";
|
||||
version = "6.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapproxy";
|
||||
repo = "mapproxy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-1LDN0vfnJlINHCIagQWhai4uJP+Fidi/9seBoJIlLl0=";
|
||||
hash = "sha256-uEnmYL6dzjR5p6MVXW23IJY1tJqfMhCjbHBDnlvaYrE=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
@ -34,6 +34,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
|
|||
python-dateutil
|
||||
pyyaml
|
||||
pyproj
|
||||
requests
|
||||
shapely
|
||||
gdal
|
||||
lxml
|
||||
|
|
|
|||
|
|
@ -166,6 +166,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
$opt/resources/app/ppm/bin/node
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
$opt/resources/app.asar.unpacked/node_modules/symbol-provider-ctags/vendor/ctags-linux
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
$opt/chrome_crashpad_handler
|
||||
|
||||
# Replace the bundled git with the one from nixpkgs
|
||||
dugite=$opt/resources/app.asar.unpacked/node_modules/dugite
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index c8c39e9617888199b86fa7c0273c0edebc85df2f..ea5e7b7e633a2de582a7b013a32a6eb6b166e2db 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -2866,6 +2866,7 @@ dependencies = [
|
||||
name = "rustversion"
|
||||
version = "1.0.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
|
|
@ -10,22 +10,18 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "pyrefly";
|
||||
version = "1.0.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "pyrefly";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-S3phcTwZlG9VBHdYzcbsLzj0uqBUDy4Xfy/tlp3AQZg=";
|
||||
hash = "sha256-GHH+oG3oUEmGNEmtrmra321UIgRD04Eq1Ct0H7VsjxU=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "pyrefly";
|
||||
|
||||
cargoPatches = [
|
||||
# https://github.com/facebook/pyrefly/issues/3383
|
||||
./fix-cargo-lock.patch
|
||||
];
|
||||
cargoHash = "sha256-OfbPPANsAhrp2MbzDEHGRLWWmUkbMMGKR5B4R6lXdE4=";
|
||||
cargoHash = "sha256-vOHcmYVKlsxueWjvCCDWwSfJt+2/71b5+NdQyW3jYH4=";
|
||||
|
||||
buildInputs = [ rust-jemalloc-sys ];
|
||||
|
||||
|
|
@ -42,9 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
export TMPDIR=$(mktemp -d)
|
||||
'';
|
||||
|
||||
# requires unstable rust features
|
||||
env.RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
cmake,
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
|
|
@ -8,16 +9,21 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "realm";
|
||||
version = "2.8.0";
|
||||
version = "2.9.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zhboner";
|
||||
repo = "realm";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7hOy+bqWoVyI2xGJ0eY7GvyIYykr6VP8d3ZYtY/jGPI=";
|
||||
hash = "sha256-gnsFqWhJOMKUaSWfRmHBksw3uWFP0smRhEbPLriEmlk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yR+ayseoUYpK9lUFRP0OLrp1+LUrtPnxiPRvjDFSNgo=";
|
||||
cargoHash = "sha256-b/cG6fGoAdhvmZXSQv/QkY3QKiMT7YcfEGohZSbk0q8=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
env.RUSTC_BOOTSTRAP = 1;
|
||||
|
||||
|
|
|
|||
79
pkgs/by-name/st/steamvr-linux-fixes/package.nix
Normal file
79
pkgs/by-name/st/steamvr-linux-fixes/package.nix
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
cmake,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "steamvr-linux-fixes";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BnuuySolutions";
|
||||
repo = "SteamVRLinuxFixes";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Zvk7I4df+Y8FsnkNLZ+h3SsdFK9BL35TCJgsSk/G58U=";
|
||||
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_LINK = "-Wl,-z,noexecstack";
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DISTORM" "${python3Packages.distorm3.src}")
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 libsteamvr_linux_fixes.so -t $out/lib
|
||||
|
||||
layerJson="$out/share/vulkan/implicit_layer.d/VkLayer_steamvr_linux_fixes.json"
|
||||
|
||||
install -Dm644 "$src/VkLayer_steamvr_linux_fixes.json" "$layerJson"
|
||||
|
||||
substituteInPlace "$layerJson" \
|
||||
--replace-fail \
|
||||
'"library_path": "./libsteamvr_linux_fixes.so"' \
|
||||
'"library_path": "'"$out"'/lib/libsteamvr_linux_fixes.so"'
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
meta = {
|
||||
description = "Vulkan layer that patches SteamVR vrcompositor for wired HMDs";
|
||||
longDescription = ''
|
||||
A Vulkan layer that patches SteamVR's vrcompositor to address issues for
|
||||
wired headsets (Vive, Index, Beyond, PSVR2, etc), applying fixes such as correct
|
||||
refresh rate support, frame presentation latency via VK_KHR_present_wait,
|
||||
FIFO_LATEST_READY on NVIDIA, swapchain usage flags for Mesa, and a crash
|
||||
on zero-sized texture allocation.
|
||||
|
||||
Add to programs.steam.extraPackages to use with Steam on NixOS. The layer
|
||||
activates automatically via the Vulkan implicit layer mechanism and can be
|
||||
disabled at runtime by setting DISABLE_STEAMVR_LINUX_FIXES=1.
|
||||
'';
|
||||
homepage = "https://github.com/BnuuySolutions/SteamVRLinuxFixes";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ Kitsune ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
sourceProvenance = with lib.sourceTypes; [ fromSource ];
|
||||
};
|
||||
})
|
||||
|
|
@ -38,7 +38,7 @@ in
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = if tde2eOnly then "tde2e" else "tdlib";
|
||||
version = "1.8.63";
|
||||
version = "1.8.65";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdlib";
|
||||
|
|
@ -47,8 +47,8 @@ stdenv.mkDerivation {
|
|||
# The tdlib authors do not set tags for minor versions, but
|
||||
# external programs depending on tdlib constrain the minor
|
||||
# version, hence we set a specific commit with a known version.
|
||||
rev = "f06b0bac65278b03d26414c096080e7bfecfef52";
|
||||
hash = "sha256-SzUDAZqdEIrIj1qUUD0MvzbCYxKLJwoX2+T0chud/rQ=";
|
||||
rev = "a8f21f5230172634becc1739050ef23ecd6ea291";
|
||||
hash = "sha256-cCNXRyeu6ZMf/0oxipPPUyniGuLzvWFLWCvklPIYvzk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "typstyle";
|
||||
version = "0.14.4";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "typstyle-rs";
|
||||
repo = "typstyle";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-zDvO++UEA94Kdfu4/qCqfF6IgdCtpIjaVZjZdlkQgNw=";
|
||||
hash = "sha256-CIIuj8sKy0XTCKbpNGHZQOQp0SszIutjeqhjmDeU2UU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9Z2l982ELoMOAzsFMhQzaXcb1vX8Y6aek0j/HbTzp38=";
|
||||
cargoHash = "sha256-TLYefRh32AP4WozN2nLdXiENbqnXHRqGT4BRJX52MLI=";
|
||||
|
||||
# Disabling tests requiring network access
|
||||
checkFlags = [
|
||||
|
|
|
|||
|
|
@ -13,20 +13,20 @@
|
|||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "wasmtime";
|
||||
version = "45.0.1";
|
||||
version = "45.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = "wasmtime";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6PZ+r+slOegjiTwkfTvBY3QeWCU69YQnpoiOC/mUND4=";
|
||||
hash = "sha256-LEQitwz+UDSX4mrjEecmoO/ZPgRnYTZ3DsD1pu8Jybs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
|
||||
auditable = false;
|
||||
|
||||
cargoHash = "sha256-2s3v0o8H2EWAzSCwc3wgsslcf+eYaRDxItwy7ccCKv4=";
|
||||
cargoHash = "sha256-uTgEW2w0RSMetd2W1ucGiVMEEvz2A7CQ79SEsE8/+BM=";
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
"wasmtime-cli"
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@
|
|||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "youtrack";
|
||||
version = "2026.1.13570";
|
||||
version = "2026.1.13757";
|
||||
|
||||
src = dockerTools.exportImage {
|
||||
diskSize = 8192;
|
||||
fromImage = dockerTools.pullImage {
|
||||
imageName = "jetbrains/youtrack";
|
||||
arch = "amd64";
|
||||
imageDigest = "sha256:2ea82348ed037f91f847dd99f196e632769dbd44a00d5659ee7a50cf9774149a";
|
||||
hash = "sha256-+GVDh4ptBQggtZDWI56pEvkPonL9QG9126amtwZS0T8=";
|
||||
imageDigest = "sha256:56c4d6b6cb3781e21a369857943a366931b69f22dee76c16b2173de0fd56a0a9";
|
||||
hash = "sha256-vWNe/1PTLX1rNR66iOZizubH2YVda8GTfXrQikWTML0=";
|
||||
};
|
||||
};
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
pytestCheckHook,
|
||||
uv-build,
|
||||
|
||||
|
|
@ -21,32 +20,19 @@
|
|||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "async-geotiff";
|
||||
version = "0.4.0";
|
||||
version = "0.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "developmentseed";
|
||||
repo = "async-geotiff";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-J72/VRDAgqGOm7rYmlkURKgWSIa11L260LX447MQWbc=";
|
||||
hash = "sha256-VC4I1ZDKC2Joh2lxscZ1UWp5p5wOEPKjTq+Ty2Z0PJc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# see https://github.com/developmentseed/async-geotiff/pull/136
|
||||
./uv-build-relax-deps.patch
|
||||
# see https://github.com/developmentseed/async-tiff/pull/292
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/developmentseed/async-geotiff/commit/f8325c0decb2a7e61faf3db5e51ec5a104d3cbdb.patch?full_index=1";
|
||||
hash = "sha256-RLqMWKtjDSmxQkUXz9dXKIIqRXM7BWkuJIbbeHxCPyQ=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [ uv-build ];
|
||||
|
||||
# see https://github.com/developmentseed/async-geotiff/pull/133
|
||||
pythonRemoveDeps = [ "types-defusedxml" ];
|
||||
|
||||
dependencies = [
|
||||
affine
|
||||
async-tiff
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
diff --git i/pyproject.toml w/pyproject.toml
|
||||
index 601e2e5..cd26339 100644
|
||||
--- i/pyproject.toml
|
||||
+++ w/pyproject.toml
|
||||
@@ -69,7 +69,7 @@ docs = [
|
||||
|
||||
|
||||
[build-system]
|
||||
-requires = ["uv_build>=0.8.8,<0.9.0"]
|
||||
+requires = ["uv_build>=0.8.8,<0.12.0"]
|
||||
build-backend = "uv_build"
|
||||
|
||||
[tool.ruff]
|
||||
diff --git i/uv.lock w/uv.lock
|
||||
index e7cd10f..2a74412 100644
|
||||
--- i/uv.lock
|
||||
+++ w/uv.lock
|
||||
@@ -55,7 +55,6 @@ dependencies = [
|
||||
{ name = "defusedxml" },
|
||||
{ name = "numpy" },
|
||||
{ name = "pyproj" },
|
||||
- { name = "types-defusedxml" },
|
||||
]
|
||||
|
||||
[package.optional-dependencies]
|
||||
@@ -77,6 +76,7 @@ dev = [
|
||||
{ name = "pytest-asyncio" },
|
||||
{ name = "rasterio", version = "1.4.4", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.12'" },
|
||||
{ name = "rasterio", version = "1.5.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.12'" },
|
||||
+ { name = "types-defusedxml" },
|
||||
{ name = "types-jsonschema" },
|
||||
]
|
||||
docs = [
|
||||
@@ -97,7 +97,6 @@ requires-dist = [
|
||||
{ name = "morecantile", marker = "extra == 'morecantile'", specifier = ">=7.0,<8.0" },
|
||||
{ name = "numpy", specifier = ">=2.0" },
|
||||
{ name = "pyproj", specifier = ">=3.3.0" },
|
||||
- { name = "types-defusedxml", specifier = ">=0.7.0.20250822" },
|
||||
]
|
||||
provides-extras = ["morecantile"]
|
||||
|
||||
@@ -114,6 +113,7 @@ dev = [
|
||||
{ name = "pytest", specifier = ">=9.0.2" },
|
||||
{ name = "pytest-asyncio", specifier = ">=1.3.0" },
|
||||
{ name = "rasterio", specifier = ">=1.4.4" },
|
||||
+ { name = "types-defusedxml", specifier = ">=0.7.0.20250822" },
|
||||
{ name = "types-jsonschema", specifier = ">=4.26.0.20260109" },
|
||||
]
|
||||
docs = [
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
# utils
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
lib,
|
||||
rustPlatform,
|
||||
|
||||
|
|
@ -20,24 +19,17 @@
|
|||
}:
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "async-tiff";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "developmentseed";
|
||||
repo = "async-tiff";
|
||||
tag = "py-v${finalAttrs.version}";
|
||||
hash = "sha256-o77iYqzBCloE5xgn0Sa6SWbrCMgnNuZwQ2MZ0wgtNew=";
|
||||
hash = "sha256-F2pweyNQMvSZeOn6kNcfk3cPqvaP1d7yAT/ygJvWxjo=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/developmentseed/async-tiff/commit/c7db2fc693089f3326328cc59863f8a9a6dd1cb9.patch?full_index=1";
|
||||
hash = "sha256-FsOZk8KZ3guqIoECYRsBQMEq8TrAQn9Z01NqUJAQOu8=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cd python
|
||||
'';
|
||||
|
|
@ -50,7 +42,7 @@ buildPythonPackage (finalAttrs: {
|
|||
pname = finalAttrs.pname;
|
||||
version = finalAttrs.version;
|
||||
src = finalAttrs.src;
|
||||
hash = "sha256-AKa4SsBYBCabMlYJqTcbHv9Z7ouqtiIEK0el/i/fo6I=";
|
||||
hash = "sha256-7iT1ZIdwlztHFEGEseEQEHzY/vqjXX/X6s5Uc3WaKxc=";
|
||||
|
||||
preBuild = ''
|
||||
cd python
|
||||
|
|
|
|||
58
pkgs/development/python-modules/cuda-bindings/13_3.nix
Normal file
58
pkgs/development/python-modules/cuda-bindings/13_3.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{
|
||||
replaceVars,
|
||||
cudaLibPaths,
|
||||
}:
|
||||
{
|
||||
version = "13.3.1";
|
||||
sourceHash = "sha256-k8ZNWw2ZpNepcWzv8TJfoxSGVn6HUCYfamEDESIcUQY=";
|
||||
|
||||
nvidiaLibsPatch = replaceVars ./patch-nvidia-libs-paths_13_3.patch {
|
||||
inherit (cudaLibPaths)
|
||||
libcudart
|
||||
libcufile
|
||||
libnvfatbin
|
||||
libnvjitlink
|
||||
libnvml
|
||||
libnvrtc
|
||||
libnvvm
|
||||
;
|
||||
};
|
||||
|
||||
# Remove cuda-pathfinder from build-system requirements
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail \
|
||||
'"cuda-pathfinder>=1.5",' \
|
||||
""
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cuda.bindings.nvfatbin"
|
||||
"cuda.bindings.nvml"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Requires GPU discovery support not available in the test environment
|
||||
"test_discover_gpus"
|
||||
|
||||
# sysfs cpu topology is not available in the sandbox, causing:
|
||||
# cuda.bindings.nvml.UnknownError: Unknown Error
|
||||
# hwloc/linux: failed to find sysfs cpu topology directory, aborting linux discovery.
|
||||
"test_device_get_cpu_affinity_within_scope"
|
||||
"test_device_get_memory_affinity"
|
||||
|
||||
# Requires the nvidia_fs kernel module (GPUDirect Storage), causing:
|
||||
# cuda.bindings.cufile.cuFileError: NVFS_SETUP_ERROR (5033): NVFS driver initialization error
|
||||
"test_buf_register_already_registered"
|
||||
"test_buf_register_host_memory"
|
||||
"test_buf_register_invalid_flags"
|
||||
"test_buf_register_large_buffer"
|
||||
"test_buf_register_multiple_buffers"
|
||||
"test_buf_register_simple"
|
||||
"test_get_bar_size_in_kb"
|
||||
"test_get_parameter_min_max_value"
|
||||
"test_set_parameter_posix_pool_slab_array"
|
||||
"test_set_stats_level"
|
||||
"test_stats_start_stop"
|
||||
];
|
||||
}
|
||||
|
|
@ -11,6 +11,7 @@
|
|||
pyclibrary,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
cuda-pathfinder,
|
||||
|
||||
# env
|
||||
symlinkJoin,
|
||||
|
|
@ -19,7 +20,6 @@
|
|||
numpy,
|
||||
|
||||
# tests
|
||||
cuda-pathfinder,
|
||||
pytest-benchmark,
|
||||
pytestCheckHook,
|
||||
util-linux,
|
||||
|
|
@ -54,6 +54,7 @@ let
|
|||
"13.0" = import ./13_0.nix args;
|
||||
"13.1" = import ./13_1.nix args;
|
||||
"13.2" = import ./13_2.nix args;
|
||||
"13.3" = import ./13_3.nix args;
|
||||
}
|
||||
.${cudaVersion} or (throw "Unsupported cuda-bindings version: ${cudaVersion}");
|
||||
|
||||
|
|
@ -114,6 +115,9 @@ buildPythonPackage (finalAttrs: {
|
|||
pyclibrary
|
||||
setuptools
|
||||
setuptools-scm
|
||||
]
|
||||
++ lib.optionals (cudaAtLeast "13.3") [
|
||||
cuda-pathfinder
|
||||
];
|
||||
|
||||
env = {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,160 @@
|
|||
diff --git a/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx b/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
|
||||
index a49ba1890f..b32fb24208 100644
|
||||
--- a/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
|
||||
+++ b/cuda_bindings/cuda/bindings/_internal/cufile_linux.pyx
|
||||
@@ -9,7 +9,7 @@ import threading
|
||||
|
||||
from .utils import FunctionNotFoundError, NotSupportedError
|
||||
|
||||
-from cuda.pathfinder import load_nvidia_dynamic_lib
|
||||
+from ctypes import CDLL
|
||||
|
||||
import cython
|
||||
|
||||
@@ -107,7 +107,7 @@ cdef void* __cuFileGetParameterPosixPoolSlabArray = NULL
|
||||
|
||||
|
||||
cdef void* load_library() except* with gil:
|
||||
- cdef uintptr_t handle = load_nvidia_dynamic_lib("cufile")._handle_uint
|
||||
+ cdef uintptr_t handle = CDLL("@libcufile@/lib/libcufile.so")._handle
|
||||
return <void*>handle
|
||||
|
||||
|
||||
diff --git a/cuda_bindings/cuda/bindings/_internal/nvfatbin_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvfatbin_linux.pyx
|
||||
index 448e51240e..6de894800b 100644
|
||||
--- a/cuda_bindings/cuda/bindings/_internal/nvfatbin_linux.pyx
|
||||
+++ b/cuda_bindings/cuda/bindings/_internal/nvfatbin_linux.pyx
|
||||
@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
|
||||
import threading
|
||||
from .utils import FunctionNotFoundError, NotSupportedError
|
||||
|
||||
-from cuda.pathfinder import load_nvidia_dynamic_lib
|
||||
+from ctypes import CDLL
|
||||
|
||||
|
||||
###############################################################################
|
||||
@@ -74,7 +74,7 @@ cdef void* __nvFatbinAddTileIR = NULL
|
||||
|
||||
|
||||
cdef void* load_library() except* with gil:
|
||||
- cdef uintptr_t handle = load_nvidia_dynamic_lib("nvfatbin")._handle_uint
|
||||
+ cdef uintptr_t handle = CDLL("@libnvfatbin@/lib/libnvfatbin.so")._handle
|
||||
return <void*>handle
|
||||
|
||||
|
||||
diff --git a/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
|
||||
index 34ad6b5f0c..dc20de43a7 100644
|
||||
--- a/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
|
||||
+++ b/cuda_bindings/cuda/bindings/_internal/nvjitlink_linux.pyx
|
||||
@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
|
||||
import threading
|
||||
from .utils import FunctionNotFoundError, NotSupportedError
|
||||
|
||||
-from cuda.pathfinder import load_nvidia_dynamic_lib
|
||||
+from ctypes import CDLL
|
||||
|
||||
|
||||
###############################################################################
|
||||
@@ -78,7 +78,7 @@ cdef void* __nvJitLinkGetLinkedLTOIR = NULL
|
||||
|
||||
|
||||
cdef void* load_library() except* with gil:
|
||||
- cdef uintptr_t handle = load_nvidia_dynamic_lib("nvJitLink")._handle_uint
|
||||
+ cdef uintptr_t handle = CDLL("@libnvjitlink@/lib/libnvJitLink.so")._handle
|
||||
return <void*>handle
|
||||
|
||||
|
||||
diff --git a/cuda_bindings/cuda/bindings/_internal/nvml_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvml_linux.pyx
|
||||
index 825931d756..77004f360c 100644
|
||||
--- a/cuda_bindings/cuda/bindings/_internal/nvml_linux.pyx
|
||||
+++ b/cuda_bindings/cuda/bindings/_internal/nvml_linux.pyx
|
||||
@@ -10,7 +10,7 @@ import threading
|
||||
|
||||
from .utils import FunctionNotFoundError, NotSupportedError
|
||||
|
||||
-from cuda.pathfinder import load_nvidia_dynamic_lib
|
||||
+from ctypes import CDLL
|
||||
|
||||
|
||||
###############################################################################
|
||||
@@ -414,7 +414,7 @@ cdef void* __nvmlGpuInstanceSetVgpuSchedulerState_v2 = NULL
|
||||
|
||||
|
||||
cdef void* load_library() except* with gil:
|
||||
- cdef uintptr_t handle = load_nvidia_dynamic_lib("nvml")._handle_uint
|
||||
+ cdef uintptr_t handle = CDLL("@libnvml@/lib/libnvidia-ml.so")._handle
|
||||
return <void*>handle
|
||||
|
||||
|
||||
diff --git a/cuda_bindings/cuda/bindings/_internal/nvrtc_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvrtc_linux.pyx
|
||||
index ac9cbca550..68644df6be 100644
|
||||
--- a/cuda_bindings/cuda/bindings/_internal/nvrtc_linux.pyx
|
||||
+++ b/cuda_bindings/cuda/bindings/_internal/nvrtc_linux.pyx
|
||||
@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
|
||||
import threading
|
||||
from .utils import FunctionNotFoundError, NotSupportedError
|
||||
|
||||
-from cuda.pathfinder import load_nvidia_dynamic_lib
|
||||
+from ctypes import CDLL
|
||||
|
||||
###############################################################################
|
||||
# Extern
|
||||
@@ -87,7 +87,7 @@ cdef void* __nvrtcGetBundledHeadersInfo = NULL
|
||||
cdef void* __nvrtcRemoveBundledHeaders = NULL
|
||||
|
||||
cdef void* load_library() except* with gil:
|
||||
- cdef uintptr_t handle = load_nvidia_dynamic_lib("nvrtc")._handle_uint
|
||||
+ cdef uintptr_t handle = CDLL("@libnvrtc@/lib/libnvrtc.so")._handle
|
||||
return <void*>handle
|
||||
|
||||
cdef int _init_nvrtc() except -1 nogil:
|
||||
diff --git a/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx b/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
|
||||
index 2a1d155862..94aa05421a 100644
|
||||
--- a/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
|
||||
+++ b/cuda_bindings/cuda/bindings/_internal/nvvm_linux.pyx
|
||||
@@ -9,7 +9,7 @@ from libc.stdint cimport intptr_t, uintptr_t
|
||||
import threading
|
||||
from .utils import FunctionNotFoundError, NotSupportedError
|
||||
|
||||
-from cuda.pathfinder import load_nvidia_dynamic_lib
|
||||
+from ctypes import CDLL
|
||||
|
||||
|
||||
###############################################################################
|
||||
@@ -76,7 +76,7 @@ cdef void* __nvvmLLVMVersion = NULL
|
||||
|
||||
|
||||
cdef void* load_library() except* with gil:
|
||||
- cdef uintptr_t handle = load_nvidia_dynamic_lib("nvvm")._handle_uint
|
||||
+ cdef uintptr_t handle = CDLL("@libnvvm@/lib/libnvvm.so")._handle
|
||||
return <void*>handle
|
||||
|
||||
|
||||
diff --git a/cuda_bindings/cuda/bindings/cyruntime.pyx.in b/cuda_bindings/cuda/bindings/cyruntime.pyx.in
|
||||
index 230b5d8f84..c88872e5f1 100644
|
||||
--- a/cuda_bindings/cuda/bindings/cyruntime.pyx.in
|
||||
+++ b/cuda_bindings/cuda/bindings/cyruntime.pyx.in
|
||||
@@ -2048,7 +2048,7 @@ cdef cudaError_t cudaGraphicsVDPAURegisterOutputSurface(cudaGraphicsResource** r
|
||||
{{if True}}
|
||||
|
||||
from libc.stdint cimport uintptr_t
|
||||
-from cuda.pathfinder import load_nvidia_dynamic_lib
|
||||
+from ctypes import CDLL
|
||||
{{if 'Windows' == platform.system()}}
|
||||
cimport cuda.bindings._lib.windll as windll
|
||||
{{else}}
|
||||
@@ -2058,11 +2058,11 @@ cimport cuda.bindings._lib.dlfcn as dlfcn
|
||||
cdef cudaError_t getLocalRuntimeVersion(int* runtimeVersion) except ?cudaErrorCallRequiresNewerDriver nogil:
|
||||
# Load
|
||||
with gil:
|
||||
- loaded_dl = load_nvidia_dynamic_lib("cudart")
|
||||
+ loaded_dl = CDLL("@libcudart@/lib/libcudart.so")
|
||||
{{if 'Windows' == platform.system()}}
|
||||
- handle = <uintptr_t>loaded_dl._handle_uint
|
||||
+ handle = <uintptr_t>loaded_dl._handle
|
||||
{{else}}
|
||||
- handle = <void *><uintptr_t>loaded_dl._handle_uint
|
||||
+ handle = <void *><uintptr_t>loaded_dl._handle
|
||||
{{endif}}
|
||||
|
||||
{{if 'Windows' == platform.system()}}
|
||||
|
|
@ -34,6 +34,7 @@
|
|||
wandb,
|
||||
|
||||
# tests
|
||||
llvmPackages,
|
||||
pytestCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
pytest-timeout,
|
||||
|
|
@ -58,6 +59,11 @@ buildPythonPackage (finalAttrs: {
|
|||
];
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
checkInputs = lib.optionals stdenv.cc.isClang [
|
||||
# test_async_iterator_* hangs after failing to find OMP headers
|
||||
llvmPackages.openmp
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"av"
|
||||
"diffusers"
|
||||
|
|
@ -172,12 +178,21 @@ buildPythonPackage (finalAttrs: {
|
|||
|
||||
# TypeError: 'NoneType' object is not subscriptable
|
||||
"test_pi0_rtc_inference_with_prev_chunk"
|
||||
|
||||
# Flakes under load with AssertionError: assert 'second' == 'last'
|
||||
"test_get_last_item_multiple_items_with_torch_queue"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# RuntimeError: Failed to initialize cpuinfo!
|
||||
"test_complementary_data_float_dtype_conversion"
|
||||
"test_float_dtype_conversion"
|
||||
"test_float_dtype_with_mixed_tensors"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# gRPC fails to connect on loopback in sandbox despite __darwinAllowLocalNetworking
|
||||
"test_end_to_end_interactions_flow"
|
||||
"test_end_to_end_parameters_flow"
|
||||
"test_end_to_end_transitions_flow"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
|
|
@ -192,6 +207,8 @@ buildPythonPackage (finalAttrs: {
|
|||
"tests/policies/rtc/test_modeling_rtc.py"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
description = "Making AI for Robotics more accessible with end-to-end learning";
|
||||
homepage = "https://github.com/huggingface/lerobot";
|
||||
|
|
|
|||
|
|
@ -8,17 +8,17 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "loro";
|
||||
version = "1.10.3";
|
||||
version = "1.13.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-aBhKscKrlK9q1Kq6QW0i9XnKvuCybLsJofZ4WCB7vOg=";
|
||||
hash = "sha256-DDcnvFL1CYV2Uy7dOZ78CM6yNMXZI1oZy9XqN8T7pIU=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-Lp4VwxmYqB2uvCuxX+tHl0QCpbCvPMjgrgPk0KL1LEQ=";
|
||||
hash = "sha256-KVBe2bUvxilOysCVfcBSZCtwexlTkVAc83tH1H7nMbQ=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nhc";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vandeurenglenn";
|
||||
repo = "nhc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-lQfuYU/5ONynCv0f+ZNuafblcvuLAdDmRA0FAxp9NTQ=";
|
||||
hash = "sha256-qSNpq21lEKZ0VVS2rN9OoDQymVGnqGCz6oeXjV1I20k=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -14,20 +14,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "owslib";
|
||||
version = "0.35.0";
|
||||
version = "0.36.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "geopython";
|
||||
repo = "OWSLib";
|
||||
tag = version;
|
||||
hash = "sha256-/5FJai6ad4ZQAK/IhiIuGv4yiBcT/iXFYcbZ+jeCoyI=";
|
||||
hash = "sha256-Of/CSLcNnpTYHRm4toQK4/HXTWNcuEMkW6obWpg96Tc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tox.ini \
|
||||
--replace-fail "--doctest-modules" "" \
|
||||
--replace-fail "--doctest-glob='tests/**/*.txt'" ""
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "setuptools<69" "setuptools"
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
|
|||
|
|
@ -11,16 +11,16 @@
|
|||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pycaption";
|
||||
version = "2.2.22";
|
||||
version = "2.2.23";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pbs";
|
||||
repo = "pycaption";
|
||||
tag = version;
|
||||
hash = "sha256-EHw4Ev5AyFvinZtN0NZPl+Egs6KQ9/OzDHZf+mhqztc=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-7U2TgjEgRYiDW0xkTRm4eyU3yHBqnfLqEw7/ZgdGJsI=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
@ -41,10 +41,10 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/pbs/pycaption/blob/${src.tag}/docs/changelog.rst";
|
||||
changelog = "https://github.com/pbs/pycaption/blob/${finalAttrs.src.tag}/docs/changelog.rst";
|
||||
description = "Closed caption converter";
|
||||
homepage = "https://github.com/pbs/pycaption";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -12,19 +12,19 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "resvg-py";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "baseplate-admin";
|
||||
repo = "resvg-py";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-jbuIRSunrs4qEVdqNEiE18UXzxxX8c/QN17MInv8DnM=";
|
||||
hash = "sha256-XYV3XVLZNlCGPvvYPtyr4UX+9yuXnV7ZWwqt2I/rxTc=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-OVjvOYPu0nZeQx+qmpUlkBuw7FY3dMDpABNZJjyX0XQ=";
|
||||
hash = "sha256-v7Y+Kh8Z5S5gn8zoijjwKq8UZGT36azltC62m9xCHiY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
color-operations,
|
||||
h5netcdf,
|
||||
hatchling,
|
||||
httpx,
|
||||
httpx2,
|
||||
morecantile,
|
||||
numexpr,
|
||||
numpy,
|
||||
|
|
@ -27,14 +27,14 @@
|
|||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "rio-tiler";
|
||||
version = "9.0.6";
|
||||
version = "9.3.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cogeotiff";
|
||||
repo = "rio-tiler";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-oLMWrf3udqlf4SlQnBU7Stm6MzXS7EN6xWiTNtOOm4g=";
|
||||
hash = "sha256-Tf3F/XRGdPDZqlXQfRc5cvGvUvu94Y6TO2cFqjFsg5g=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
|
@ -43,7 +43,7 @@ buildPythonPackage (finalAttrs: {
|
|||
attrs
|
||||
cachetools
|
||||
color-operations
|
||||
httpx
|
||||
httpx2
|
||||
morecantile
|
||||
numexpr
|
||||
numpy
|
||||
|
|
@ -60,19 +60,19 @@ buildPythonPackage (finalAttrs: {
|
|||
obstore
|
||||
zarr
|
||||
];
|
||||
geotiff = [
|
||||
async-geotiff
|
||||
obstore
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
h5netcdf
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
]
|
||||
++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies);
|
||||
|
||||
checkInputs = [
|
||||
async-geotiff
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "rio_tiler" ];
|
||||
|
||||
disabledTests = [
|
||||
|
|
@ -80,6 +80,8 @@ buildPythonPackage (finalAttrs: {
|
|||
"test_dataset_reader"
|
||||
# for some reason, str date representation are not the same
|
||||
"test_xarray_reader"
|
||||
"test_geoxarray_reader_coordinates"
|
||||
"test_geoxarray_reader_compat"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
setuptools,
|
||||
# runtime deps
|
||||
click,
|
||||
fastjsonschema,
|
||||
jsonschema,
|
||||
pyyaml,
|
||||
requests,
|
||||
|
|
@ -14,14 +15,14 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "stac-validator";
|
||||
version = "4.1.0";
|
||||
version = "4.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "stac-utils";
|
||||
repo = "stac-validator";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qO1DRYpPn+zarHTj2mZQ2LJ2uhmS1bax6Yxy035ZEUA=";
|
||||
hash = "sha256-JrLpny4PDXvjKN1iQ0uxcTuPgNTykZzv7RdQDoMLQT4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
|
@ -32,6 +33,7 @@ buildPythonPackage rec {
|
|||
|
||||
dependencies = [
|
||||
click
|
||||
fastjsonschema
|
||||
jsonschema
|
||||
pyyaml
|
||||
requests
|
||||
|
|
|
|||
193
pkgs/development/python-modules/tilelang/default.nix
Normal file
193
pkgs/development/python-modules/tilelang/default.nix
Normal file
|
|
@ -0,0 +1,193 @@
|
|||
{
|
||||
lib,
|
||||
tilelang,
|
||||
|
||||
cudaSupport ? torch.cudaSupport,
|
||||
|
||||
buildPythonPackage,
|
||||
cudaPackages,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
pythonOlder,
|
||||
stdenv,
|
||||
|
||||
# nativeBuildInputs
|
||||
autoPatchelfHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
|
||||
# build-system
|
||||
cmake,
|
||||
cython,
|
||||
ninja,
|
||||
scikit-build-core,
|
||||
|
||||
# dependencies
|
||||
apache-tvm-ffi,
|
||||
cloudpickle,
|
||||
ml-dtypes,
|
||||
numpy,
|
||||
psutil,
|
||||
torch,
|
||||
torch-c-dlpack-ext,
|
||||
tqdm,
|
||||
typing-extensions,
|
||||
z3-solver,
|
||||
|
||||
# optional-dependencies,
|
||||
matplotlib,
|
||||
|
||||
# nativeCheckInputs
|
||||
einops,
|
||||
flash-linear-attention,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
|
||||
pname = "tilelang";
|
||||
version = "0.1.11";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tile-ai";
|
||||
repo = "tilelang";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-C/c99/26/dBnQJYGrZ+NXl1Rqk3bjM2kpkgP/hWkTGE=";
|
||||
};
|
||||
|
||||
postPatch =
|
||||
# remove binary only packages from build-system.requires (pythonRelaxDeps
|
||||
# doesn't work)
|
||||
''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail '"z3-solver' '# "z3-solver' \
|
||||
--replace-fail '"patchelf' '# "patchelf'
|
||||
''
|
||||
# don't call git
|
||||
+ ''
|
||||
sed -i '/def get_git_commit_id()/a\\ return None' version_provider.py
|
||||
''
|
||||
# fix permissions for install_name_tool -id
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace cmake/pypi-z3/FindZ3.cmake \
|
||||
--replace-fail COPYONLY 'FILE_PERMISSIONS
|
||||
OWNER_READ OWNER_WRITE OWNER_EXECUTE
|
||||
GROUP_READ GROUP_WRITE GROUP_EXECUTE
|
||||
WORLD_READ WORLD_WRITE WORLD_EXECUTE
|
||||
COPYONLY'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
autoPatchelfHook
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
];
|
||||
|
||||
build-system = [
|
||||
cmake
|
||||
cython
|
||||
ninja
|
||||
scikit-build-core
|
||||
];
|
||||
|
||||
env = {
|
||||
NO_GIT_VERSION = true;
|
||||
USE_CUDA = cudaSupport;
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeFeature "Z3_INCLUDE_DIR" "${z3-solver.dev}/include")
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_cudart
|
||||
cudaPackages.cuda_nvrtc # nvrtc.h
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
finalAttrs.passthru.apache-tvm-ffi
|
||||
cloudpickle
|
||||
ml-dtypes
|
||||
numpy
|
||||
psutil
|
||||
torch
|
||||
tqdm
|
||||
typing-extensions
|
||||
z3-solver
|
||||
]
|
||||
++ z3-solver.requiredPythonModules
|
||||
++ lib.optionals (pythonOlder "3.14") [
|
||||
torch-c-dlpack-ext
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
vis = [
|
||||
matplotlib
|
||||
];
|
||||
};
|
||||
|
||||
preFixup =
|
||||
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
# libtvm_ffi.so
|
||||
addAutoPatchelfSearchPath "${finalAttrs.passthru.apache-tvm-ffi}/${python.sitePackages}/tvm_ffi/lib"
|
||||
# libz3.so.4.16
|
||||
addAutoPatchelfSearchPath "${z3-solver.lib}/lib"
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
# @rpath/libz3.dylib
|
||||
install_name_tool -add_rpath "${z3-solver.lib}/lib" \
|
||||
"$out/${python.sitePackages}/tilelang/lib/libtvm_compiler.dylib"
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "tilelang" ];
|
||||
|
||||
# requires GPU
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [
|
||||
einops
|
||||
flash-linear-attention
|
||||
pytestCheckHook
|
||||
];
|
||||
disabledTestPaths = [
|
||||
"3rdparty"
|
||||
# ImportError: cannot import name 'AutoModelForVision2Seq' from 'transformers'
|
||||
"examples/bitnet-1.58b/vllm_workspace"
|
||||
# FileNotFoundError: [Errno 2] No such file or directory: './old/bin/python'
|
||||
"maint/scripts/test_perf_regression.py"
|
||||
];
|
||||
|
||||
passthru.gpuCheck = tilelang.overridePythonAttrs {
|
||||
requiredSystemFeatures = [ "cuda" ];
|
||||
doCheck = true;
|
||||
};
|
||||
|
||||
passthru.apache-tvm-ffi = apache-tvm-ffi.overrideAttrs (previousAttrs: {
|
||||
version = "0.1.10";
|
||||
src = previousAttrs.src.override {
|
||||
tag = null;
|
||||
rev = "3c35034fd1026011736e19a4e0e1ed0f22058c42";
|
||||
hash = "sha256-dqAO6RLLGIRzPk7dNQsQCck+ziyONddhK/t4+S28cn8=";
|
||||
};
|
||||
# fix eval
|
||||
meta.changelog = "";
|
||||
});
|
||||
|
||||
meta = {
|
||||
description = "Tile level programming language to generate high performance code";
|
||||
homepage = "https://tilelang.com/";
|
||||
downloadPage = "https://github.com/tile-ai/tilelang/releases";
|
||||
changelog = "https://github.com/tile-ai/tilelang/releases/tag/${finalAttrs.src.tag}";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
asl20 # 3rdparty/tvm
|
||||
bsd3 # 3rdparty/cutlass
|
||||
];
|
||||
maintainers = with lib.maintainers; [ prince213 ];
|
||||
};
|
||||
})
|
||||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
buildNpmPackage rec {
|
||||
pname = "universal-remote-card";
|
||||
version = "4.11.2";
|
||||
version = "4.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nerwyn";
|
||||
repo = "android-tv-card";
|
||||
rev = version;
|
||||
hash = "sha256-HWQK2k9AlnY+BrmRLoXLJ5CnbgmcdxRTP4BywdtzRjs=";
|
||||
hash = "sha256-EUaybuKA9lu8UYpcAJEXfoJE1gbYZO+3Vz8fAs0dQ1U=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-nDK1OAF3KFEMP5NJYarmgC2y+mQ96dMYVTHXgoSozvc=";
|
||||
npmDepsHash = "sha256-+3RslxpHHYjcpHggr1OSOTu0xGavmhHjOZD7tULPqIA=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
|||
|
|
@ -19816,6 +19816,8 @@ self: super: with self; {
|
|||
|
||||
tiledb = callPackage ../development/python-modules/tiledb { inherit (pkgs) tiledb; };
|
||||
|
||||
tilelang = callPackage ../development/python-modules/tilelang { };
|
||||
|
||||
tilequant = callPackage ../development/python-modules/tilequant { };
|
||||
|
||||
tiler = callPackage ../development/python-modules/tiler { };
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue