diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d66e45b02a3c..1016fd471801 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -481,11 +481,11 @@ "vendorHash": "sha256-874QpqIFFhzIGJZ8nKGcUe9qEpR9jQkx4nl75Cpqpww=" }, "grafana_grafana": { - "hash": "sha256-/Qad6cDOL+XdhCWOWFdjwbzEa8VQoFTjILjvcuoT7Ow=", + "hash": "sha256-STYK0M5eq5hECKJUrk2Q4qhOrPt+eiyIGi0boukSHBM=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v4.36.0", + "rev": "v4.36.2", "spdx": "MPL-2.0", "vendorHash": "sha256-VEAtUCVZ3nJ1jfDYkkek+VQ1LjNQgRstRNtsM05ebZo=" }, diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index f2d36f54a2d5..5e78dcc72b84 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -123,10 +123,6 @@ fi init_remote(){ local url=$1 clean_git init --initial-branch=master - # Disable maintenance: it's not useful for a short-lived clone, and - # background maintenance causes non-deterministic builds. - # https://github.com/NixOS/nixpkgs/issues/524215 - clean_git config maintenance.auto false clean_git remote add origin "$url" if [ -n "$sparseCheckout" ]; then git config remote.origin.partialclonefilter "blob:none" @@ -518,6 +514,15 @@ HOME="$tmpHomePath" unset XDG_CONFIG_HOME export GIT_CONFIG_NOSYSTEM=1 + +# Disable maintenance: it's not useful for a short-lived clone, and +# background maintenance causes non-deterministic builds. +# https://github.com/NixOS/nixpkgs/issues/524215 +export GIT_CONFIG_COUNT=$(( ${GIT_CONFIG_COUNT:-0} + 1 )) +# Not the best but generic enough that it will work with `impureEnvVars` +export "GIT_CONFIG_KEY_$(( GIT_CONFIG_COUNT - 1 ))=maintenance.auto" +export "GIT_CONFIG_VALUE_$(( GIT_CONFIG_COUNT - 1 ))=false" + if test -n "$builder"; then test -n "$out" -a -n "$url" -a -n "$rev" || usage if test -n "$rootDir"; then diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix index d77fa769c3c8..5dba14a2e683 100644 --- a/pkgs/by-name/ap/apache-airflow/python-package.nix +++ b/pkgs/by-name/ap/apache-airflow/python-package.nix @@ -105,6 +105,10 @@ let inherit src version; sourceRoot = "${src.name}/airflow-core/src/airflow/ui"; + # vite build resolves "localhost" during the build, which the darwin + # sandbox blocks by default (getaddrinfo ENOTFOUND localhost). + __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin; + nativeBuildInputs = [ nodejs pnpm @@ -139,6 +143,8 @@ let inherit src version; sourceRoot = "${src.name}/airflow-core/src/airflow/api_fastapi/auth/managers/simple/ui"; + __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin; + nativeBuildInputs = [ nodejs pnpm diff --git a/pkgs/by-name/be/beadwork/package.nix b/pkgs/by-name/be/beadwork/package.nix index 6fd756f45749..aee9068b0f38 100644 --- a/pkgs/by-name/be/beadwork/package.nix +++ b/pkgs/by-name/be/beadwork/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "beadwork"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "jallum"; repo = "beadwork"; rev = "v${finalAttrs.version}"; - hash = "sha256-SuIQygsd/X8khQ1+S/af5haREBxsznFfcefLwsJRv/g="; + hash = "sha256-NlmnoFz4gYIB3g3C/7rmgKhUkh8q/Vn1drhHIuUScTg="; }; vendorHash = "sha256-LjqZSI7F3C8GyNrPK/BwG9QTmNg89hFAvhUuBjmbHTU="; diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix index 75c2c05f3fdb..40edff2db2fa 100644 --- a/pkgs/by-name/be/bento/package.nix +++ b/pkgs/by-name/be/bento/package.nix @@ -8,17 +8,17 @@ buildGoModule (finalAttrs: { pname = "bento"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "warpstreamlabs"; repo = "bento"; tag = "v${finalAttrs.version}"; - hash = "sha256-VfXXGtcn4bUTtIL39nusHciw3Rv2A4xL6s1fGnmBTZ0="; + hash = "sha256-fCRy9iTK34nqEWnsl1amdxYaCgaVmvqaPDS6Z7MuFbk="; }; proxyVendor = true; - vendorHash = "sha256-eVZd24c3imolyrt97gNrm1ro8VBMYH4fbzTzzSk4iEI="; + vendorHash = "sha256-jJI2MGKqGkZjuyRcwUupajBq9Vf5a/Cf5V6A/pT4XDs="; subPackages = [ "cmd/bento" diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix index 9386c89bc9d1..8a0a38176433 100644 --- a/pkgs/by-name/ci/cilium-cli/package.nix +++ b/pkgs/by-name/ci/cilium-cli/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "cilium-cli"; - version = "0.19.2"; + version = "0.19.4"; src = fetchFromGitHub { owner = "cilium"; repo = "cilium-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-zlPl6J+Vbv2An1bauzhee8hrtEEg1ENR6SKSzv3PCS0="; + hash = "sha256-DDNs9cJrurTA2yNrm0AJTfl7m6tiWwERmdgKzceiK9I="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/co/copyparty/package.nix b/pkgs/by-name/co/copyparty/package.nix index e52c42841642..c2a4ee2dc0c3 100644 --- a/pkgs/by-name/co/copyparty/package.nix +++ b/pkgs/by-name/co/copyparty/package.nix @@ -71,11 +71,11 @@ in python3Packages.buildPythonApplication rec { pname = "copyparty${nameSuffix}"; - version = "1.20.14"; + version = "1.20.16"; src = fetchurl { url = "https://github.com/9001/copyparty/releases/download/v${version}/copyparty-${version}.tar.gz"; - hash = "sha256-h4Pcg5C+F2c9MG9CTnoo3Z+bT84AXjVzTTDBspZwfBI="; + hash = "sha256-Yl+V1l2VzdaJhRBRjQE5BeZ2bH0q4Oqa59XeyW6J4C0="; }; pyproject = true; diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix index 3148f4e442e7..3e6154a19da9 100644 --- a/pkgs/by-name/cr/croc/package.nix +++ b/pkgs/by-name/cr/croc/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "croc"; - version = "10.4.3"; + version = "10.4.4"; src = fetchFromGitHub { owner = "schollz"; repo = "croc"; rev = "v${finalAttrs.version}"; - hash = "sha256-cQgGs4vv7RGa9reM3QoYDW6PdREx+rIzg4uXXrahPSg="; + hash = "sha256-Kwli0wgicebRlJE+c4McH6a7I2udRppJtKBopJ/eiFc="; }; - vendorHash = "sha256-qS+jjchXysIj4ZcZoUWg8W0uyYTYPPy8DdhZEP/uZGg="; + vendorHash = "sha256-jXv8M4MnaTVitLmQ4X+pyIihxcVGlEP4IEwZT1LPKIA="; subPackages = [ "." ]; diff --git a/pkgs/by-name/di/diun/package.nix b/pkgs/by-name/di/diun/package.nix index 8a492b58ecbf..29fa92935ccc 100644 --- a/pkgs/by-name/di/diun/package.nix +++ b/pkgs/by-name/di/diun/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "diun"; - version = "4.31.0"; + version = "4.33.0"; src = fetchFromGitHub { owner = "crazy-max"; repo = "diun"; tag = "v${finalAttrs.version}"; - hash = "sha256-H05yZSH2rUrwM+ZR/PDCxXmrDkZ/Gd4RrpywGk5eW2A="; + hash = "sha256-EVIT6au5B3wzb5xTc2o/sY7p3+tT5lWjlzQX5HdQNkA="; }; vendorHash = null; diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 929b162916d6..72b378bd5de1 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "files-cli"; - version = "2.15.305"; + version = "2.15.316"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${finalAttrs.version}"; - hash = "sha256-LnwcDzJLqxqYtjqi9XWOpa80DHKUDaL5eu6Yv/ZKiNs="; + hash = "sha256-3+M14M0xf2dkIAdgNGe2gTmJ9Vr7h/vCe4H/quiSsU0="; }; - vendorHash = "sha256-vGhH3CTEQ5YIFZo/HYN6iMBTnH2O5mO1XbDCbWZDvYE="; + vendorHash = "sha256-rly02HSliL+WXs/XTn9Eb5W+jeGuNVRS8R2vjPGnhGM="; ldflags = [ "-s" diff --git a/pkgs/by-name/gc/gcompris/package.nix b/pkgs/by-name/gc/gcompris/package.nix index 438f28ca1425..38030d31e044 100644 --- a/pkgs/by-name/gc/gcompris/package.nix +++ b/pkgs/by-name/gc/gcompris/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gcompris"; - version = "25.1.1"; + version = "26.1"; src = fetchurl { url = "mirror://kde/stable/gcompris/qt/src/gcompris-qt-${finalAttrs.version}.tar.xz"; - hash = "sha256-Y23pFov1/WKPrwYYRfGI8sOF0tp/ksSwRJE5zmxtoSo="; + hash = "sha256-w4m4Y7KfASzMGz7vdAmC/2x2VME6LjQzl+5GYSTzEzk="; }; postPatch = '' @@ -23,11 +23,6 @@ stdenv.mkDerivation (finalAttrs: { # /nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/bin/..//nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/share/gcompris-qt/rcc/core.rcc substituteInPlace src/core/config.h.in --replace-fail \ "../@_data_dest_dir@" "../share/gcompris-qt" - - # Fix private Qt6 targets search for Qt 6.10 - substituteInPlace CMakeLists.txt --replace-fail \ - "set(QT_COMPONENTS Qml Quick Gui Multimedia Core Svg Network LinguistTools Sensors QuickControls2 QuickTemplates2 Charts Widgets QmlWorkerScript)" \ - "set(QT_COMPONENTS Qml Quick Gui Multimedia Core Svg Network LinguistTools Sensors QuickControls2 QuickTemplates2 Charts Widgets QmlWorkerScript CorePrivate QuickControls2BasicPrivate WaylandClientPrivate)" ''; cmakeFlags = [ @@ -51,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtcharts qtdeclarative + qtgraphs qtimageformats qtmultimedia qtsensors diff --git a/pkgs/by-name/gd/gdscript-formatter/package.nix b/pkgs/by-name/gd/gdscript-formatter/package.nix index 51ff27505dee..006afb7e1012 100644 --- a/pkgs/by-name/gd/gdscript-formatter/package.nix +++ b/pkgs/by-name/gd/gdscript-formatter/package.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gdscript-formatter"; - version = "0.18.2"; + version = "0.20.1"; src = fetchFromGitHub { owner = "GDQuest"; repo = "GDScript-formatter"; tag = finalAttrs.version; - hash = "sha256-V9zrL2Aku5e+9McXpXdXvsGJKjqVXIIaAsoAF2xHB4g="; + hash = "sha256-T0NURMu/AWRC+z3VSv20cpdUEq+nczsdp+C9SlvObmg="; # Needed due to .gitattributes being used for the Godot addon and export-ignoring all files deepClone = true; # Avoid hash differences due to differences in .git leaveDotGit = false; }; - cargoHash = "sha256-xqGmv/e1Ch/EqutIb2claiJ8fQGDDdOriOZdt8SR8mw="; + cargoHash = "sha256-JGvtjxHfkMknilFCRJS3VzvN6yifDx0nTNTQua0qmlI="; cargoBuildFlags = [ "--bin=gdscript-formatter" diff --git a/pkgs/by-name/gl/glew/package.nix b/pkgs/by-name/gl/glew/package.nix index bc9265b05632..db1e2c5f1b55 100644 --- a/pkgs/by-name/gl/glew/package.nix +++ b/pkgs/by-name/gl/glew/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, cmake, libGLU, libxmu, @@ -15,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "glew"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { url = "mirror://sourceforge/glew/glew-${finalAttrs.version}.tgz"; - sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l"; + hash = "sha256-tkeQ+UuSas1+j4TF1gAKhstDlnvR5oiwMIkHl5nJ6Ik="; }; outputs = [ @@ -28,27 +27,6 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - patches = [ - # https://github.com/nigels-com/glew/pull/342 - (fetchpatch { - url = "https://github.com/nigels-com/glew/commit/966e53fa153175864e151ec8a8e11f688c3e752d.diff"; - hash = "sha256-xsSwdAbdWZA4KVoQhaLlkYvO711i3QlHGtv6v1Omkhw="; - }) - - # don't make EGL support disable GLX, use the same patch as ArchLinux - # https://gitlab.archlinux.org/archlinux/packaging/packages/glew/-/blob/ca08ff5d4cd3548a593eb1118d0a84b0c3670349/egl+glx.patch - (fetchpatch { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/glew/-/raw/ca08ff5d4cd3548a593eb1118d0a84b0c3670349/egl+glx.patch?inline=false"; - hash = "sha256-IG3FPhhaor1kshEH3Kr8yzIHqBhczRwCqH7ZeDwlzGE="; - }) - - # cmake 4 compatibility - (fetchpatch { - url = "https://github.com/nigels-com/glew/commit/a4d8b2a2a30576eb1b984ba5d573702acfc5b92e.diff"; - hash = "sha256-S6Om0A4y5po2rHl8OXcue2zOcBpCmBZYvf10LfKEYfI="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libxmu diff --git a/pkgs/by-name/im/imagemagick/package.nix b/pkgs/by-name/im/imagemagick/package.nix index bbf070eaac05..225c2b999cf8 100644 --- a/pkgs/by-name/im/imagemagick/package.nix +++ b/pkgs/by-name/im/imagemagick/package.nix @@ -41,7 +41,7 @@ pango, libtiffSupport ? true, libtiff, - libultrahdrSupport ? true, + libultrahdrSupport ? lib.meta.availableOn stdenv.hostPlatform libultrahdr, libultrahdr, libxml2Support ? true, libxml2, diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix index 4e4291b865f1..6400bc79064a 100644 --- a/pkgs/by-name/is/istioctl/package.nix +++ b/pkgs/by-name/is/istioctl/package.nix @@ -7,15 +7,15 @@ buildGoModule (finalAttrs: { pname = "istioctl"; - version = "1.29.2"; + version = "1.30.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = finalAttrs.version; - hash = "sha256-QGohEiUMCiXiaJGmd8x0o7trr2ZOB4cVQcUhPwnzZ/M="; + hash = "sha256-tCh6XRnr6X6dCqUT+7au0fY2d9vV3EXPsugMSRK+064="; }; - vendorHash = "sha256-/RBckWhh+fpogxVz7G6lfnhWjEvqB2b/aXAXQiTBS08="; + vendorHash = "sha256-HvDcknniiEfg9UCZc7S5EJfD+T4laBbSj05h/GTscoI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/li/libultrahdr/package.nix b/pkgs/by-name/li/libultrahdr/package.nix index 2416feb1a6ae..c3ef856b8fbf 100644 --- a/pkgs/by-name/li/libultrahdr/package.nix +++ b/pkgs/by-name/li/libultrahdr/package.nix @@ -102,7 +102,33 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ yzx9 ]; - platforms = lib.platforms.all; + # CMake script rejects non-approved platform targets + # https://github.com/google/libultrahdr/pull/383 would get rid of that + platforms = + let + # Values from the "Detect system" section in /CMakeLists.txt + # https://github.com/google/libultrahdr/blob/d52a0d13814ca399fc8a07e23de1d2c63f0e8404/CMakeLists.txt#L34 + oss = [ + "linux" + "windows" + "darwin" + ]; + archs = [ + "i686" + "x86_64" + "aarch64" + "armv7l" + "riscv64" + "riscv32" + "loongarch64" + ]; + in + lib.lists.intersectLists lib.platforms.all ( + lib.lists.crossLists (arch: os: "${arch}-${os}") [ + archs + oss + ] + ); license = with lib.licenses; [ asl20 ]; diff --git a/pkgs/by-name/md/mdwatch/package.nix b/pkgs/by-name/md/mdwatch/package.nix index f8950e7fe4fc..cf761ae0919d 100644 --- a/pkgs/by-name/md/mdwatch/package.nix +++ b/pkgs/by-name/md/mdwatch/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdwatch"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "vimlinuz"; repo = "mdwatch"; tag = "v${finalAttrs.version}"; - hash = "sha256-h2ZUcvRkCxvVZWIroyzLGkzW4B3+iMCU5GRvIcNTrWk="; + hash = "sha256-vTwuhhMK0Rr3z1OCqTg8EaYQ3fuFe5S3WHQie/Spw98="; }; - cargoHash = "sha256-03qTW1NuNEzU6krG2S9C/9sCB6U9nM3nu4isdPR+3Aw="; + cargoHash = "sha256-e3fB3UutnPYX1dxAlK0uu1n589W92MddSxWwDPWQQJc="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/me/meshcore-cli/package.nix b/pkgs/by-name/me/meshcore-cli/package.nix new file mode 100644 index 000000000000..e521c4560a48 --- /dev/null +++ b/pkgs/by-name/me/meshcore-cli/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication meshcore-cli diff --git a/pkgs/by-name/mi/minecraft-server-hibernation/package.nix b/pkgs/by-name/mi/minecraft-server-hibernation/package.nix index 8c8b3c60650f..907124bbfc9a 100644 --- a/pkgs/by-name/mi/minecraft-server-hibernation/package.nix +++ b/pkgs/by-name/mi/minecraft-server-hibernation/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "minecraft-server-hibernation"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "gekware"; repo = "minecraft-server-hibernation"; rev = "v${finalAttrs.version}"; - hash = "sha256-b6LeqjIraIasHBpaVgy8esl4NV8rdBrfO7ewgeIocS8="; + hash = "sha256-VLn/33g/y1blDIjBjriXvkRwK056ILftiB/dwoargFY="; }; vendorHash = null; diff --git a/pkgs/by-name/mi/minecraft-server/versions.json b/pkgs/by-name/mi/minecraft-server/versions.json index b9efdc695553..ac403058dc95 100644 --- a/pkgs/by-name/mi/minecraft-server/versions.json +++ b/pkgs/by-name/mi/minecraft-server/versions.json @@ -1,4 +1,10 @@ { + "26.1": { + "sha1": "97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51", + "url": "https://piston-data.mojang.com/v1/objects/97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51/server.jar", + "version": "26.1.2", + "javaVersion": 25 + }, "1.21": { "sha1": "64bb6d763bed0a9f1d632ec347938594144943ed", "url": "https://piston-data.mojang.com/v1/objects/64bb6d763bed0a9f1d632ec347938594144943ed/server.jar", diff --git a/pkgs/by-name/mi/minizinc/package.nix b/pkgs/by-name/mi/minizinc/package.nix index 3b64b09d4dbb..4747ebe471fa 100644 --- a/pkgs/by-name/mi/minizinc/package.nix +++ b/pkgs/by-name/mi/minizinc/package.nix @@ -31,13 +31,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "minizinc"; - version = "2.9.3"; + version = "2.9.7"; src = fetchFromGitHub { owner = "MiniZinc"; repo = "libminizinc"; - rev = finalAttrs.version; - sha256 = "sha256-eu2yNRESypXWCn8INTjGwwRXTWdGYvah/hc2iqFKQmw="; + tag = finalAttrs.version; + hash = "sha256-k9imUrGn6VyQVvHU8Ef9wvBIOEHA3SSmEwIui3fW9JI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/nu/nushell/package.nix b/pkgs/by-name/nu/nushell/package.nix index 82f6c4a939eb..730352af67e0 100644 --- a/pkgs/by-name/nu/nushell/package.nix +++ b/pkgs/by-name/nu/nushell/package.nix @@ -24,16 +24,16 @@ rustPlatform.buildRustPackage (finalAttrs: { # NOTE: when updating this to a new non-patch version, please also try to # update the plugins. Plugins only work if they are compiled for the same # major/minor version. - version = "0.113.0"; + version = "0.113.1"; src = fetchFromGitHub { owner = "nushell"; repo = "nushell"; tag = finalAttrs.version; - hash = "sha256-qIiPEW2XO2gf9pMDHhGEvCfSU5iiOKMwi+9wAQEfjjw="; + hash = "sha256-sV2fN9TOWQVyPVFSWdNLPOtOdLuynPTvt9+uqJsgtds="; }; - cargoHash = "sha256-E7xO6oTw4uWh41g92AqkQ5iIr/uD6RCc2kBAYUP3Flg="; + cargoHash = "sha256-yfJPhx+Y+Y3vkIQU/w3DCKJpH4LsEmzDzyEuyor5PDc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index b4a0b29d761b..8ed559250c8f 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.69.0"; + version = "0.70.1"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-Rp7fXUq5c74AiRHxcFEvbcCYQC7dsCG0LB+j6uMkqwI="; + hash = "sha256-GdheBzjKxINhJqVctLiPHXbHHEG6jEB7g/kULPKbGas="; }; - cargoHash = "sha256-0Z+VnexqN0ZOVMmxski3cRn2trMyk5DhKvXnh0l+K/g="; + cargoHash = "sha256-j2cx/lsUhpLHHNRaWa/q31FRXUfIHCZYIyeZYNG6Bcg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix index 03a9e753c225..e72d6597cae2 100644 --- a/pkgs/by-name/pk/pkgsite/package.nix +++ b/pkgs/by-name/pk/pkgsite/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "pkgsite"; - version = "0-unstable-2026-05-22"; + version = "0-unstable-2026-05-29"; src = fetchFromGitHub { owner = "golang"; repo = "pkgsite"; - rev = "866fa310855a76cf898838dac1cc56850e15cca6"; - hash = "sha256-zhBJ7sYXyzK9Rs2qA9CziIG50cCZ88a/msKzqIQIlJM="; + rev = "b045357bb4e9728f75e705110c5ca0f7c7a78fbf"; + hash = "sha256-tdZHFoSoLUBB6I6FHRPG6rkPXB0dkgWC9RKqQHjP4YU="; }; - vendorHash = "sha256-A5gfYxgbq+5WG4W642fhRHw78oWGOrI+OyJ66W/gl00="; + vendorHash = "sha256-jMHGQrGQjNsWNj7BnhRYDn17W+6VI3A940AkR4Rmvok="; subPackages = [ "cmd/pkgsite" ]; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/by-name/pr/prooftree/package.nix similarity index 83% rename from pkgs/applications/science/logic/prooftree/default.nix rename to pkgs/by-name/pr/prooftree/package.nix index e396aa977968..cd60f98d32be 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/by-name/pr/prooftree/package.nix @@ -2,31 +2,25 @@ lib, stdenv, fetchurl, - pkg-config, - ncurses, ocamlPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "prooftree"; version = "0.14"; src = fetchurl { - url = "https://askra.de/software/prooftree/releases/prooftree-${version}.tar.gz"; - sha256 = "sha256-nekV2UnjibOk4h0jZ1jV7W5pE/hXWb3fUoLTJb3Jzc0="; + url = "https://askra.de/software/prooftree/releases/prooftree-${finalAttrs.version}.tar.gz"; + hash = "sha256-nekV2UnjibOk4h0jZ1jV7W5pE/hXWb3fUoLTJb3Jzc0="; }; strictDeps = true; - nativeBuildInputs = [ - pkg-config - ] - ++ (with ocamlPackages; [ + nativeBuildInputs = with ocamlPackages; [ ocaml findlib - camlp5 - ]); - buildInputs = [ ncurses ] ++ (with ocamlPackages; [ lablgtk ]); + ]; + buildInputs = with ocamlPackages; [ lablgtk ]; prefixKey = "--prefix "; @@ -55,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.jwiegley ]; license = lib.licenses.gpl3; }; -} +}) diff --git a/pkgs/by-name/ro/roapi-http/package.nix b/pkgs/by-name/ro/roapi-http/package.nix index 97364da05734..068ec508eecd 100644 --- a/pkgs/by-name/ro/roapi-http/package.nix +++ b/pkgs/by-name/ro/roapi-http/package.nix @@ -1,56 +1,42 @@ { - stdenv, + cmake, + fetchFromGitHub, lib, - fetchurl, + rustPlatform, }: -let +rustPlatform.buildRustPackage (finalAttrs: { pname = "roapi-http"; version = "0.6.0"; - target = lib.optionalString stdenv.hostPlatform.isDarwin "apple-darwin"; -in -# TODO build from source, currently compilation fails on darwin on snmalloc with -# ./mem/../ds/../pal/pal_apple.h:277:64: error: use of undeclared identifier 'kCCSuccess' -# reinterpret_cast(&result), sizeof(result)) != kCCSuccess) -# -# rustPlatform.buildRustPackage { -# pname = "roapi-http"; -# inherit version; -# src = fetchFromGitHub { -# owner = "roapi"; -# repo = "roapi"; -# rev = "roapi-http-v${version}"; -# sha256 = "sha256-qHAO3h+TTCQQ7vdd4CoXVGfKZ1fIxTWKqbUNnRsJaok="; -# }; - -# cargoHash = "sha256-qDJKC6MXeKerPFwJsNND3WkziFtGkTvCgVEsdPbBGAo="; - -# buildAndTestSubdir = "roapi-http"; - -# nativeBuildInputs = [ cmake ]; - -stdenv.mkDerivation rec { - inherit pname version; - - src = fetchurl { - url = "https://github.com/roapi/roapi/releases/download/${pname}-v${version}/${pname}-${target}.tar.gz"; - sha256 = "sha256-lv6BHg/LkrOlyq8D1udAYW8/AbZRb344YCcVnwo3ZHk="; + src = fetchFromGitHub { + owner = "roapi"; + repo = "roapi"; + rev = "roapi-http-v${finalAttrs.version}"; + sha256 = "sha256-qHAO3h+TTCQQ7vdd4CoXVGfKZ1fIxTWKqbUNnRsJaok="; }; - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - installPhase = '' - tar xvzf $src - mkdir -p "$out/bin" - cp roapi-http $out/bin - ''; + cargoHash = "sha256-PlQq2zttiheQ0WFBLuH4dBSuExK+7hP22aLfmtNtLCk="; + + buildAndTestSubdir = "roapi-http"; + + nativeBuildInputs = [ cmake ]; + + # snmalloc fails to compile on Darwin, and upstream doesn't use it for Linux + buildNoDefaultFeatures = true; + buildFeatures = [ "rustls" ]; + + # the crate uses `#![deny(warnings)]`, which breaks with lints added by + # newer rustc releases than the code was written against + env.RUSTFLAGS = "--cap-lints warn"; + + checkFlags = [ "--skip=test_http2" ]; # this test tries `curl` and fails meta = { description = "Create full-fledged APIs for static datasets without writing a single line of code"; homepage = "https://roapi.github.io/docs/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; - platforms = lib.platforms.darwin; + platforms = lib.platforms.unix; + mainProgram = "roapi-http"; }; -} +}) diff --git a/pkgs/by-name/th/thunderbird-mcp/package.nix b/pkgs/by-name/th/thunderbird-mcp/package.nix index 0a041783ea39..dabc4c8ea9c0 100644 --- a/pkgs/by-name/th/thunderbird-mcp/package.nix +++ b/pkgs/by-name/th/thunderbird-mcp/package.nix @@ -7,13 +7,13 @@ buildNpmPackage (finalAttrs: { pname = "thunderbird-mcp"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "TKasperczyk"; repo = "thunderbird-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-3o1NskuMc4vQzjaUYgoFL7JZ46Enr6qdPcnePjtul2s="; + hash = "sha256-wewuXZV6tjSJ3gjmUkIoRFWwGbqVUc7xxEt1kp9dWSM="; }; postPatch = '' diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index 190cfc9cdafb..11befdbe5028 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "vacuum-go"; - version = "0.26.7"; + version = "0.29.0"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; tag = "v${finalAttrs.version}"; - hash = "sha256-KKunxNMTYm3FCxierFHU8xc0+SA+iXBB4Xs8H3/rm/o="; + hash = "sha256-4+J2f3rKC9DHxQrxFbL4y7yjyZuYUipKy0t7K9X8O+g="; }; - vendorHash = "sha256-Vf9WsP3DEjb1xFWql5SHHmBC/81+VxhrK/2a0uEkPJg="; + vendorHash = "sha256-OP7nceABcJFozDZ8GHtxjIi6a9eaQuQUYW1cOAAXJTU="; env.CGO_ENABLED = 0; ldflags = [ diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index cfa6c39587b6..816d6857d8e4 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -13,16 +13,16 @@ buildNpmPackage (finalAttrs: { pname = "vsce"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; tag = "v${finalAttrs.version}"; - hash = "sha256-MYsJOQSrpsEMDw5WbfcfNfrTvu6R5JmKVMeq8WpaFqs="; + hash = "sha256-DjPRSFXkw+MXDGjpWJGdp1bfptFdQEs5Djft2WyYK70="; }; - npmDepsHash = "sha256-QN3twFFcLPqHH4wdC3+G34ze/G/m1RlaPwrHVa0NoFI="; + npmDepsHash = "sha256-U5FTBunSvHDl1lCMNcTuPrVZw6YTbT3LCJfbc6E2Sys="; postPatch = '' substituteInPlace package.json --replace-fail '"version": "0.0.0"' '"version": "${finalAttrs.version}"' diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 0e9e7f645289..24f145e288e4 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -21,6 +21,7 @@ parallelBuild ? true, fetchFromGitHub, + fetchpatch2, gawk, gnum4, gnused, @@ -111,14 +112,18 @@ stdenv.mkDerivation { ++ optionals javacSupport [ openjdk11 ] ++ optionals enableSystemd [ systemd ]; + patches = lib.optionals (!wxSupport && major == "27") [ + # https://github.com/erlang/otp/pull/11162 + (fetchpatch2 { + name = "otp-27-doc-target-fix.patch"; + url = "https://github.com/erlang/otp/commit/7ce587b61a2557fca79f1c130794abf834f37ee1.patch?full_index=1"; + hash = "sha256-Ce6tWUzeF6TQMxus7ultxG2piFllw/xa5IPLCxSd024="; + }) + ]; + # disksup requires a shell postPatch = '' substituteInPlace lib/os_mon/src/disksup.erl --replace-fail '"sh ' '"${runtimeShell} ' - '' - # https://github.com/erlang/otp/issues/11151 - + lib.optionalString (!wxSupport && major == "27") '' - substituteInPlace lib/wx/doc/Makefile \ - --replace-fail $'ifneq ($(CAN_BUILD_DRIVER), true)\nDOC_TARGETS=\nendif\n' "" ''; debugInfo = enableDebugInfo; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 552065098bc1..17ef7da85270 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.31.2"; + version = "1.31.3"; outputs = [ "bin" @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { owner = "libinput"; repo = "libinput"; rev = version; - hash = "sha256-qHcLiJ5Fa+/tbBmvI8FFBJYC7C3VHcBNWusseZAkuCU="; + hash = "sha256-2l+YGD1AFTwJRouMg0d3nQX+2me6A4yOB4g2WE2H//g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index c80fd5ca4bea..2da8698a4e07 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "grumphp"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "phpro"; repo = "grumphp"; tag = "v${finalAttrs.version}"; - hash = "sha256-S+zF1IodekM21BpTiL/7EjPqi57r9LRCeF8oqPYFSXs="; + hash = "sha256-vQ6H8IpHHSfmlRcRgXcYhQeV3vmtkB3S5F8WltJqcKE="; }; - vendorHash = "sha256-jM7oH72C64mTIIcPUj754sHzXI+b8OOOB0zd2qpKuAA="; + vendorHash = "sha256-Z3v5n7YhcyRF5iZhGa+iju81bObD0Nzls2V8DZ2WBVk="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/development/python-modules/meshcore-cli/default.nix b/pkgs/development/python-modules/meshcore-cli/default.nix new file mode 100644 index 000000000000..e77403ae3317 --- /dev/null +++ b/pkgs/development/python-modules/meshcore-cli/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + bleak, + meshcore, + prompt-toolkit, + requests, +}: + +buildPythonPackage (finalAttrs: { + pname = "meshcore-cli"; + version = "1.5.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fdlamotte"; + repo = "meshcore-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wby97e9Xulk2pwNJ9mnvKxWlTsWmH4n3zlTtYi7WS6I="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + meshcore + bleak + prompt-toolkit + requests + ]; + + pythonImportsCheck = [ + "meshcore_cli" + ]; + + doCheck = false; # no tests + + __structuredAttrs = true; + + meta = { + changelog = "https://github.com/meshcore-dev/meshcore-cli/releases/tag/${finalAttrs.src.tag}"; + description = "Command line interface to MeshCore node"; + homepage = "https://github.com/fdlamotte/meshcore-cli"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.haylin ]; + mainProgram = "meshcore-cli"; + }; +}) diff --git a/pkgs/development/python-modules/meshcore/default.nix b/pkgs/development/python-modules/meshcore/default.nix index 9d5a7330b5bb..0858e8f42a4f 100644 --- a/pkgs/development/python-modules/meshcore/default.nix +++ b/pkgs/development/python-modules/meshcore/default.nix @@ -2,31 +2,54 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, + + # build-system hatchling, + # dependencies bleak, pycayennelpp, pyserial-asyncio-fast, + pycryptodome, + + # tests + pytest-asyncio, + pytestCheckHook, }: buildPythonPackage (finalAttrs: { pname = "meshcore"; - version = "2.2.8"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "meshcore-dev"; repo = "meshcore_py"; tag = "v${finalAttrs.version}"; - hash = "sha256-S3hyA2TsgEHwB0gv5xFMTbwnAoGbceq0C5+8MBedD70="; + hash = "sha256-Vz2LQaP44Yojf9h2rSBvKRjW99IOj7C5MxqQnIUoIRE="; }; + patches = [ + (fetchpatch { + # https://github.com/meshcore-dev/meshcore_py/pull/71 + url = "https://github.com/meshcore-dev/meshcore_py/commit/9294e574739844e0e291b972b40e1a0a40149e47.patch"; + hash = "sha256-Ufr+5rDDO32W6dtD7wEU34iLJai3H0dBCEtLS5j4u/0="; + }) + ]; + build-system = [ hatchling ]; dependencies = [ bleak pycayennelpp pyserial-asyncio-fast + pycryptodome + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook ]; pythonImportsCheck = [ "meshcore" ]; diff --git a/pkgs/development/python-modules/pyzotero/default.nix b/pkgs/development/python-modules/pyzotero/default.nix index 939c59bc1c24..c9a9dfc2d59a 100644 --- a/pkgs/development/python-modules/pyzotero/default.nix +++ b/pkgs/development/python-modules/pyzotero/default.nix @@ -22,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "pyzotero"; - version = "1.11.0"; + version = "1.13.0"; pyproject = true; src = fetchFromGitHub { owner = "urschrei"; repo = "pyzotero"; tag = "v${finalAttrs.version}"; - hash = "sha256-8K9Lg9Ehl0QARU2tAidMyynorPIMGtxDXzshmbpb6So="; + hash = "sha256-5Ew5u6+a+8wv0scyQ4IOcZWCimEQLbe9OuKBIKrPoXc="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix index 98fe5115a14d..4e53ae9d56a5 100644 --- a/pkgs/servers/home-assistant/build-custom-component/default.nix +++ b/pkgs/servers/home-assistant/build-custom-component/default.nix @@ -52,13 +52,10 @@ lib.extendMkDerivation { runHook postInstall ''; - nativeBuildInputs = - with home-assistant.python3Packages; - [ - manifestRequirementsCheckHook - packaging - ] - ++ (args.nativeBuildInputs or [ ]); + nativeBuildInputs = [ + manifestRequirementsCheckHook + ] + ++ (args.nativeBuildInputs or [ ]); passthru = { isHomeAssistantComponent = true; diff --git a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix index bb091bd0e1b4..90faa79d7bbf 100644 --- a/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix +++ b/pkgs/servers/home-assistant/build-custom-component/manifest-requirements-check-hook.nix @@ -6,6 +6,7 @@ makeSetupHook { name = "manifest-check-hook"; + propagatedNativeBuildInputs = [ python3Packages.packaging ]; substitutions = { pythonCheckInterpreter = python3Packages.python.interpreter; checkManifest = ./check_manifest.py; diff --git a/pkgs/servers/home-assistant/custom-components/meshcore/package.nix b/pkgs/servers/home-assistant/custom-components/meshcore/package.nix new file mode 100644 index 000000000000..3f87437585a0 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/meshcore/package.nix @@ -0,0 +1,50 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, + cachetools, + meshcore, + meshcore-cli, + paho-mqtt, + pynacl, + pytest-asyncio, + pytestCheckHook, +}: + +buildHomeAssistantComponent (finalAttrs: { + owner = "meshcore-dev"; + domain = "meshcore"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "meshcore-dev"; + repo = "meshcore-ha"; + tag = "v${finalAttrs.version}"; + hash = "sha256-DykWjoMVVKzDa05UtytrkwUej80zteZThi8E3e7M+ZU="; + }; + + dependencies = [ + cachetools + meshcore + meshcore-cli + paho-mqtt + pynacl + ]; + + ignoreVersionRequirement = [ + "meshcore" + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/meshcore-dev/meshcore-ha/releases/tag/${finalAttrs.src.tag}"; + description = "Home Assistant integration for MeshCore"; + homepage = "https://github.com/meshcore-dev/meshcore-ha/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.haylin ]; + }; +}) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/meshcore-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/meshcore-card/package.nix new file mode 100644 index 000000000000..fab17e122838 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/meshcore-card/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "meshcore-card"; + version = "0.3.5"; + strictDeps = true; + + src = fetchFromGitHub { + owner = "jpettitt"; + repo = "meshcore-card"; + tag = "v${finalAttrs.version}"; + hash = "sha256-XfqtCGSDrfkNIqWuH8Y8DLacJf9x7iaZXDiKDWdqzhw="; + }; + + npmDepsHash = "sha256-KgG6PGSGw9zCOPboZjo/gpAs2OwLg3LRl3rqenIvTG8="; + + installPhase = '' + runHook preInstall + + mkdir $out + cp dist/${finalAttrs.pname}.js $out/ + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + __structuredAttrs = true; + + meta = { + description = "MeshCore Lovelace card for Home Assistant"; + homepage = "https://github.com/jpettitt/meshcore-card"; + changelog = "https://github.com/jpettitt/meshcore-card/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae72b6e1fa76..0123c7deb142 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11000,10 +11000,6 @@ with pkgs; inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml camlp4; }; - prooftree = callPackage ../applications/science/logic/prooftree { - ocamlPackages = ocaml-ng.ocamlPackages_4_12; - }; - satallax = callPackage ../applications/science/logic/satallax { inherit (ocaml-ng.ocamlPackages_4_14) ocaml; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d2c5b587e4c..edeaf390c28d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9898,6 +9898,8 @@ self: super: with self; { meshcore = callPackage ../development/python-modules/meshcore { }; + meshcore-cli = callPackage ../development/python-modules/meshcore-cli { }; + meshio = callPackage ../development/python-modules/meshio { }; meshlabxml = callPackage ../development/python-modules/meshlabxml { };