Merge remote-tracking branch 'origin/master' into staging-next

K900 ef953482 0b98a49e

Changed files
+62 -34
pkgs
applications
editors
vscode
extensions
development
python-modules
meshcore
warp-lang
top-level
+10 -10
pkgs/applications/editors/vscode/extensions/default.nix
···
mktplcRef = {
publisher = "banacorn";
name = "agda-mode";
-
version = "0.6.5";
-
hash = "sha256-fq3JiqdtYN9kAWDvu8X+2mlU5kj2RwUTPA4QF43vShQ=";
+
version = "0.6.6";
+
hash = "sha256-QzFahhNXwfJQibmoAbBDes+/ZCb83oTAN2w96U5Mf8Y=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog";
···
mktplcRef = {
publisher = "DanielSanMedium";
name = "dscodegpt";
-
version = "3.14.19";
-
hash = "sha256-58D9ZzNIMrVa0nQjev0dGNth29iWL7U/X0NkVLSB7hg=";
+
version = "3.14.85";
+
hash = "sha256-JeoLWQLYxWdkOmlxrMIhroyfZSL1aWg/rXQORiRQueI=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";
···
mktplcRef = {
name = "foam-vscode";
publisher = "foam";
-
version = "0.27.2";
-
hash = "sha256-wuguBoIYTdlu03wNu9sfRnUkBvYgZEcTJiujq7KWZZ4=";
+
version = "0.27.5";
+
hash = "sha256-QjZlG94bRwrrZhJPUmcyPfyEj8Qd4ZTCCUQ6+CkG9XY=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
···
mktplcRef = {
publisher = "jeff-hykin";
name = "better-nix-syntax";
-
version = "2.2.0";
-
hash = "sha256-MmmRKq/7uTCywnEceKukJW/jIc0oIx0GIz55ugh4gQg=";
+
version = "2.2.3";
+
hash = "sha256-KhmkCMBWagi0JjZvupgaU7LA6hsGRE6SiHqdJlXyyX8=";
};
meta = {
description = "Visual Studio Code extension providing Nix Syntax highlighting";
···
mktplcRef = {
name = "uiua-vscode";
publisher = "uiua-lang";
-
version = "0.0.65";
-
hash = "sha256-qmjXKuNVYkzaJUUvW/apXzPVE3XuZjxTl3EYNoKHVNc=";
+
version = "0.0.66";
+
hash = "sha256-eFdRzkoYJeQdpebKcSFhhnZZXFcA3oKURvqjBx5hReQ=";
};
meta = {
description = "VSCode language extension for Uiua";
+41
pkgs/development/python-modules/meshcore/default.nix
···
+
{
+
lib,
+
buildPythonPackage,
+
fetchPypi,
+
+
# build-system
+
hatchling,
+
+
# dependencies
+
bleak,
+
pycayennelpp,
+
pyserial-asyncio,
+
}:
+
+
buildPythonPackage rec {
+
pname = "meshcore";
+
version = "2.1.5";
+
pyproject = true;
+
+
src = fetchPypi {
+
inherit pname version;
+
sha256 = "sha256-gXofzLmydfN0Shrrlbwk+6Rr2kARPqypP6+43rHZOJE=";
+
};
+
+
build-system = [ hatchling ];
+
+
dependencies = [
+
bleak
+
pycayennelpp
+
pyserial-asyncio
+
];
+
+
pythonImportsCheck = [ "meshcore" ];
+
+
meta = with lib; {
+
description = "Python library for communicating with meshcore companion radios";
+
homepage = "https://github.com/meshcore-dev/meshcore_py";
+
license = licenses.mit;
+
maintainers = [ maintainers.haylin ];
+
};
+
}
+9 -24
pkgs/development/python-modules/warp-lang/default.nix
···
effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv;
stdenv = builtins.throw "Use effectiveStdenv instead of stdenv directly, as it may be replaced by cudaPackages.backendStdenv";
-
version = "1.8.1";
+
version = "1.9.0";
libmathdx = effectiveStdenv.mkDerivation (finalAttrs: {
# NOTE: The version used should match the version Warp requires:
# https://github.com/NVIDIA/warp/blob/${version}/deps/libmathdx-deps.packman.xml
pname = "libmathdx";
-
version = "0.2.2";
+
version = "0.2.3";
outputs = [
"out"
···
src =
let
baseURL = "https://developer.download.nvidia.com/compute/cublasdx/redist/cublasdx";
+
cudaMajorVersion = cudaPackages.cudaMajorVersion; # only 12, 13 supported
+
cudaVersion = "${cudaMajorVersion}.0"; # URL example: ${baseURL}/cuda12/${name}-${version}-cuda12.0.zip
name = lib.concatStringsSep "-" [
finalAttrs.pname
"Linux"
effectiveStdenv.hostPlatform.parsed.cpu.name
finalAttrs.version
+
"cuda${cudaVersion}"
];
# nix-hash --type sha256 --to-sri $(nix-prefetch-url "https://...")
hashes = {
-
aarch64-linux = "sha256-uadBl2HTWIzpYyUxHqnLZtqq42v13KYXSOJXz0Wgtrk=";
-
x86_64-linux = "sha256-YU26l3q+HH1fyBD96oMrl+e96gmiC/krzJv6VJss3mY=";
+
aarch64-linux = "sha256-d/aBC+zU2ciaw3isv33iuviXYaLGLdVDdzynGk9SFck=";
+
x86_64-linux = "sha256-CHIH0s4SnA67COtHBkwVCajW/3f0VxNBmuDLXy4LFIg=";
};
in
lib.mapNullable (
hash:
fetchurl {
inherit hash name;
-
url = "${baseURL}/${name}.tar.gz";
+
url = "${baseURL}/cuda${cudaMajorVersion}/${name}.tar.gz";
}
) (hashes.${effectiveStdenv.hostPlatform.system} or null);
···
owner = "NVIDIA";
repo = "warp";
tag = "v${version}";
-
hash = "sha256-cSG8uncJMl4rbQ48L8XJY1Illr6usVX8no0jDhECwbo=";
+
hash = "sha256-OEg2mUsEdRKhgx0fIraqme4moKNh1RSdN7/yCT1V5+g=";
};
patches =
···
'-lmathdx_static' \
'-lmathdx'
''
-
# Broken tests on aarch64. Since unittest doesn't support disabling a
-
# single test, and pytest isn't compatible, we patch the test file directly
-
# instead.
-
#
-
# See: https://github.com/NVIDIA/warp/issues/552
-
+ lib.optionalString effectiveStdenv.hostPlatform.isAarch64 ''
-
nixLog "patching $PWD/warp/tests/test_fem.py to disable broken tests on aarch64"
-
substituteInPlace "$PWD/warp/tests/test_fem.py" \
-
--replace-fail \
-
'add_function_test(TestFem, "test_integrate_gradient", test_integrate_gradient, devices=devices)' \
-
""
-
''
# AssertionError: 0.4082476496696472 != 0.40824246406555176 within 5 places
+ lib.optionalString effectiveStdenv.hostPlatform.isDarwin ''
nixLog "patching $PWD/warp/tests/test_fem.py to disable broken tests on darwin"
···
writableTmpDirAsHomeHook
];
requiredSystemFeatures = lib.optionals cudaSupport [ "cuda" ];
-
# Many unit tests fail with segfaults on aarch64-linux, especially in the sim
-
# and grad modules. However, other functionality generally works, so we don't
-
# mark the package as broken.
-
#
-
# See: https://www.github.com/NVIDIA/warp/issues/{356,372,552}
-
meta.broken = effectiveStdenv.hostPlatform.isAarch64 && effectiveStdenv.hostPlatform.isLinux;
}
''
nixLog "running ${name}"
+2
pkgs/top-level/python-packages.nix
···
meshcat = callPackage ../development/python-modules/meshcat { };
+
meshcore = callPackage ../development/python-modules/meshcore { };
+
meshio = callPackage ../development/python-modules/meshio { };
meshlabxml = callPackage ../development/python-modules/meshlabxml { };