diff options
Diffstat (limited to 'pkgs')
49 files changed, 684 insertions, 265 deletions
diff --git a/pkgs/applications/maui/mauikit-imagetools.nix b/pkgs/applications/maui/mauikit-imagetools.nix index 141d1953528a0..1b6a994b9fac4 100644 --- a/pkgs/applications/maui/mauikit-imagetools.nix +++ b/pkgs/applications/maui/mauikit-imagetools.nix @@ -1,5 +1,6 @@ { lib , mkDerivation +, fetchpatch , cmake , extra-cmake-modules , kconfig @@ -16,6 +17,14 @@ mkDerivation { pname = "mauikit-imagetools"; + patches = [ + (fetchpatch { + name = "remove-unused-method.patch"; + url = "https://invent.kde.org/maui/mauikit-imagetools/-/commit/344852044d407b144bca01c41a409ceaa548bec0.patch"; + hash = "sha256-Cpq/XzDgrKD8YVex2z9VxGTA+iDI5703+fHwkn0cIWA="; + }) + ]; + nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/pkgs/applications/misc/blender/wrapper.nix b/pkgs/applications/misc/blender/wrapper.nix index 24ff72e14f6cb..3828d61a8645c 100644 --- a/pkgs/applications/misc/blender/wrapper.nix +++ b/pkgs/applications/misc/blender/wrapper.nix @@ -2,7 +2,7 @@ , lib , blender , makeWrapper -, python39Packages +, python3Packages }: { name ? "wrapped" , packages ? [] @@ -12,7 +12,7 @@ stdenv.mkDerivation { inherit (blender) version; src = blender; - nativeBuildInputs = [ python39Packages.wrapPython makeWrapper ]; + nativeBuildInputs = [ python3Packages.wrapPython makeWrapper ]; installPhase = '' mkdir $out/{share/applications,bin} -p sed 's/Exec=blender/Exec=blender-${name}/g' $src/share/applications/blender.desktop > $out/share/applications/blender-${name}.desktop @@ -22,15 +22,9 @@ stdenv.mkDerivation { buildPythonPath "$pythonPath" - echo '#!/usr/bin/env bash ' >> $out/bin/blender-${name} - for p in $program_PATH; do - echo "export PATH=\$PATH:$p " >> $out/bin/blender-${name} - done - for p in $program_PYTHONPATH; do - echo "export PYTHONPATH=\$PYTHONPATH:$p " >> $out/bin/blender-${name} - done - echo 'exec ${blender}/bin/blender "$@"' >> $out/bin/blender-${name} - chmod +x $out/bin/blender-${name} + makeWrapper ${blender}/bin/blender $out/bin/blender-${name} \ + --prefix PATH : $program_PATH \ + --prefix PYTHONPATH : $program_PYTHONPATH ''; pythonPath = packages; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 010c9d1ba4d57..0272ed69fb2be 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -28,13 +28,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-I8w8hnts3bELUm2e0fRfRcfK9uoS0ZbymZZPEVcizEI=", + "hash": "sha256-WBjtrjhv3DBusE64Gu/XXOwaH4ByHoyS6tGcY6VE2iU=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.2.1", + "rev": "v4.3.0", "spdx": "MIT", - "vendorHash": "sha256-nF/efMhmrXfBlF9w9tC4npHxjX2/299OfqTpvPapfMo=" + "vendorHash": "sha256-NnWYUVziSWuedgXG1jXrdYF7il8KmA5MQVlK5AEhc+U=" }, "akamai": { "hash": "sha256-P/5tLtcPqhf48DqqMKKNCOrvT+I60N9rC1W/4RdFXqY=", @@ -665,13 +665,13 @@ "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-Z8mllx/TO0EUQNSOGcUhMRAsV7jiUhybzYDPg2ZtUec=", + "hash": "sha256-G6+xplMymxziIVof67ONtVMLAaQc33A0pLscchNi8kc=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.0.0", + "rev": "v2.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Xbnf8ejyojd3JD7h580hlM0PC4nD+sjpodV9hr0/F+c=" + "vendorHash": "sha256-om6Onp+Go74YfA8J2DALhJy1c+s5GbXYMpUM9a28bdI=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -810,11 +810,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-/p/NBw8dPzStLs9LTvvqDUSNJ9oMCG0e4bT+gIsPEGA=", + "hash": "sha256-XHHZpl936xZ4jjk71bmlxm1xilqFamdgL3AdkyRBT5Y=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.119.0", + "rev": "v4.120.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1008,11 +1008,11 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-VvL5lGPNtcjrtpB/p//7UXuUQxjV/+Deb+R3p+V8GtM=", + "hash": "sha256-H3+2lyn17FwF/zskVAzz0mYnyPkL2/otqoCkgcVFWf4=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v6.23.0", + "rev": "v6.24.0", "spdx": "MPL-2.0", "vendorHash": "sha256-0fqIaIINBvTAHVHZP/AcS4hNyjXHM+wfHp/0I7xqRhg=" }, @@ -1235,11 +1235,11 @@ "vendorHash": "sha256-wKKrBSJkbdqqnDLoS+jhvI26rOzvMWjjsN8wh67Le5U=" }, "vultr": { - "hash": "sha256-4Um4UyDjtamy2s15K3Idm5edZj5BOy13+kr39wl9e0Q=", + "hash": "sha256-h9MQv4BTv9y4A6HSDE3dIV7aKwaIWRYy5EyE2T0mpG4=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.15.0", + "rev": "v2.15.1", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 835ef8a70bc4d..95a57a701924f 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230508-1"; + version = "20230510"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-0kkbJGZEnB6bL+aNhHpSI2oHpsVmju3OEFG7mitKBsc="; + hash = "sha256-EsFF9fPpHfVmbLm2hRpcJBmwfovfK4CV3LukrG9nP3U="; }; postPatch = '' diff --git a/pkgs/applications/office/gnote/default.nix b/pkgs/applications/office/gnote/default.nix new file mode 100644 index 0000000000000..43bb42ea202ee --- /dev/null +++ b/pkgs/applications/office/gnote/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchurl +, desktop-file-utils +, gettext +, gspell +, gtkmm3 +, itstool +, libsecret +, libuuid +, libxml2 +, libxslt +, meson +, ninja +, pkg-config +, wrapGAppsHook +, gnome +}: + +stdenv.mkDerivation rec { + pname = "gnote"; + version = "44.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + hash = "sha256-3DvXkmj+mdTtVmeawHbMnZqq9ieWE403HPCIFffmSS0="; + }; + + buildInputs = [ + gspell + gtkmm3 + libsecret + libuuid + libxml2 + libxslt + ]; + + nativeBuildInputs = [ + desktop-file-utils + gettext + itstool + meson + ninja + pkg-config + wrapGAppsHook + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/Gnote"; + description = "A note taking application"; + maintainers = with maintainers; [ jfvillablanca ]; + license = licenses.gpl3Only; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 185df9f64150e..df6e87d5a5e40 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -2,14 +2,14 @@ let pname = "phpstan"; - version = "1.9.4"; + version = "1.10.15"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-A+F/ZoL6dLYx4MWN0eWXtQnmWJPYBqEcSgY4A1oR3mo="; + sha256 = "sha256-zGrAgQttAvGdRpuOB3V/GprMzc2NMya4d3MY1SIfYOQ="; }; dontUnpack = true; diff --git a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 13834d56d0401..06a9c072f279b 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -6,17 +6,20 @@ , azure-common , azure-mgmt-core , azure-mgmt-nspkg -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "10.0.0"; + version = "10.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-TDGrC7YO05Ywa8uEINqqw4Wxag65aklIUwS+2aVMHwA="; + hash = "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4="; }; propagatedBuildInputs = [ @@ -24,14 +27,14 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; # has no tests doCheck = false; - pythonImportsCheck = [ "azure.mgmt.containerinstance" ]; + pythonImportsCheck = [ + "azure.mgmt.containerinstance" + ]; meta = with lib; { description = "This is the Microsoft Azure Container Instance Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-security/default.nix b/pkgs/development/python-modules/azure-mgmt-security/default.nix index f0c116a1bb68b..b760acc8c8a62 100644 --- a/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-security"; - version = "3.0.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q="; + hash = "sha256-OLA+/oLCNEzqID/alebQC3rCJ4L6HAtYXNDqLI/z5wI="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index fc4ffde105347..941862b2a3d38 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.4.26"; + version = "1.4.27"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-rkyeG0xZZVO7SkfFyxq07c373YElblIUqJpwWc1nF58="; + hash = "sha256-iQNMU77nTv6KY9LJb1fiBUVs5LkpX732UpJAYdUWNyc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index 65bc61ba1edb4..62dbfd059b110 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.13.1"; + version = "0.14.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KQOUeooetgMCZOMBCKpyyxqAXPyQUMD0AUxK7ToXoAs="; + hash = "sha256-VG5ujc3aHW2fkG6k6xUYqgHJxfWkQOSVkXstr1PL1Zg="; }; nativeCheckInputs = [ @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast runtime type checking for Python"; homepage = "https://github.com/beartype/beartype"; + changelog = "https://github.com/beartype/beartype/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 56fdc5ed8211b..c0047b69dd411 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.1.2"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lOtdrNXY9IYMGFdqhX4rM228OAZ2bUEBZKP+gcDGfuM="; + hash = "sha256-uPa8iXG++doRMAK83NSnqiqnZSIjdL7zMTkjdRrSjtA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bpycv/bpycv-test.py b/pkgs/development/python-modules/bpycv/bpycv-test.py index 94e1bb122c77f..1bf2b9f5a8d3c 100644 --- a/pkgs/development/python-modules/bpycv/bpycv-test.py +++ b/pkgs/development/python-modules/bpycv/bpycv-test.py @@ -5,8 +5,11 @@ import bpycv import os import glob import random +from pathlib import Path example_data_dir = os.environ['BPY_EXAMPLE_DATA'] +out_dir = Path(os.environ['out']) +out_dir.mkdir(parents=True, exist_ok=True) models = sorted(glob.glob(os.path.join(example_data_dir, "model", "*", "*.obj"))) cat_id_to_model_path = dict(enumerate(sorted(models), 1)) @@ -19,6 +22,7 @@ bpy.context.scene.render.engine = "CYCLES" bpy.context.scene.cycles.samples = 32 bpy.context.scene.render.resolution_y = 1024 bpy.context.scene.render.resolution_x = 1024 +bpy.context.view_layer.cycles.denoising_store_passes = False # A transparency stage for holding rigid body stage = bpycv.add_stage(transparency=True) @@ -69,8 +73,8 @@ for i in range(20): # render image, instance annoatation and depth in one line code result = bpycv.render_data() -dataset_dir = "./dataset" -result.save(dataset_dir=dataset_dir, fname="0", save_blend=True) -print(f'Save to "{dataset_dir}"') -print(f'Open "{dataset_dir}/vis/" to see visualize result.') + +result.save(dataset_dir=str(out_dir.resolve()), fname="0", save_blend=True) +print(f'Save to "{out_dir}"') +print(f'Open "{out_dir}/vis/" to see visualize result.') diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix index 03aef9fd6dfef..09c3b4f8283d1 100644 --- a/pkgs/development/python-modules/bpycv/default.nix +++ b/pkgs/development/python-modules/bpycv/default.nix @@ -1,16 +1,21 @@ -{ lib +{ stdenv +, lib +, beautifulsoup4 +, blender +, blender-with-packages +, boxx +, bpycv , buildPythonPackage -, fetchPypi , fetchFromGitHub +, fetchPypi , fetchurl -, writeText -, blender , minexr -, beautifulsoup4 -, zcs -, requests , opencv3 -, boxx +, python3Packages +, requests +, runCommand +, writeText +, zcs }: buildPythonPackage rec { @@ -37,27 +42,32 @@ buildPythonPackage rec { ''; # pythonImportsCheck = [ "bpycv" ]; # this import depends on bpy that is only available inside blender - nativeCheckInputs = [ blender ]; - checkPhase = let - bpycv_example_data = fetchFromGitHub { - owner = "DIYer22"; - repo = "bpycv_example_data"; - hash = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q="; - rev = "6ce0e65c107d572011394da16ffdf851e988dbb4"; - }; - in '' - TEMPDIR=$(mktemp -d) - pushd $TEMPDIR - cp -r ${bpycv_example_data} example_data - chmod +w -R example_data - BPY_EXAMPLE_DATA=${bpycv_example_data} blender -b -P ${./bpycv-test.py} - popd - ''; + doCheck = false; + + passthru.tests = { + render = runCommand "bpycv-render-test" { + BPY_EXAMPLE_DATA = fetchFromGitHub { + owner = "DIYer22"; + repo = "bpycv_example_data"; + hash = "sha256-dGb6KvbXTGTu5f4AqhA+i4AwTqBoR5SdXk0vsMEcD3Q="; + rev = "6ce0e65c107d572011394da16ffdf851e988dbb4"; + }; + nativeBuildInputs = [ + ((blender-with-packages.override {inherit blender python3Packages;}) { + packages = [ bpycv ]; + }) + ]; + } '' + blender-wrapped -b -P ${./bpycv-test.py} + ''; + }; meta = with lib; { description = "Computer vision utils for Blender"; homepage = "https://github.com/DIYer22/bpycv"; license = licenses.mit; - maintainers = with maintainers; [ lucasew ]; + maintainers = [ maintainers.lucasew ]; + broken = stdenv.isAarch64; + inherit (blender.meta) platforms; }; } diff --git a/pkgs/development/python-modules/cexprtk/default.nix b/pkgs/development/python-modules/cexprtk/default.nix index 98c3b84160919..53c906c613baf 100644 --- a/pkgs/development/python-modules/cexprtk/default.nix +++ b/pkgs/development/python-modules/cexprtk/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cexprtk"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - hash = "sha256-c7QXB+oXzkRveiPpNrW/HY8pMtpZx/RtDpJMVE7fY/A="; + hash = "sha256-QhftIybufVPO/YbLFycR4qYEAtQMcRPP5jKS6o6dFZg="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/eternalegypt/default.nix b/pkgs/development/python-modules/eternalegypt/default.nix index 6682ae36a6feb..2065d603fae14 100644 --- a/pkgs/development/python-modules/eternalegypt/default.nix +++ b/pkgs/development/python-modules/eternalegypt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "eternalegypt"; - version = "0.0.15"; + version = "0.0.16"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-CKiv5gVHaEyO9P5x2FKgpSIm2pUiFptaEQVPZHALASk="; + hash = "sha256-ubKepd3yBaoYrIUe5WCt1zd4CjvU7SeftOR+2cBaEf0="; }; propagatedBuildInputs = [ @@ -28,11 +28,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "eternalegypt" ]; + pythonImportsCheck = [ + "eternalegypt" + ]; meta = with lib; { description = "Python API for Netgear LTE modems"; homepage = "https://github.com/amelchio/eternalegypt"; + changelog = "https://github.com/amelchio/eternalegypt/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index 7a3f4dbd805a9..017dd74fcede0 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -33,12 +33,21 @@ buildPythonPackage rec { ./skip-test.patch ]; + postPatch = '' + substituteInPlace "test_flake8_future_import.py" \ + --replace "'flake8'" "'${lib.getExe flake8}'" + ''; + propagatedBuildInputs = [ flake8 ]; nativeCheckInputs = [ six ]; checkPhase = '' + runHook preCheck + ${python.interpreter} -m test_flake8_future_import + + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 30849134cb569..1df4625a68184 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "fx2"; - version = "0.9"; + version = "0.11"; src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; rev = "v${version}"; - hash = "sha256-Uk+K7ym92JX4fC3PyTNxd0UvBzoNZmtbscBYjSWChuk="; + hash = "sha256-uJpXsUMFqJY7mjj1rtfc0XWEfNDxO1xXobgBDGFHnp4="; }; nativeBuildInputs = [ sdcc ]; @@ -23,8 +23,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ libusb1 crcmod ]; preBuild = '' + make -C firmware cd software - ${python.pythonForBuild.interpreter} setup.py build_ext ''; preInstall = '' diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 7d0f5740b7345..adb6e2424ff21 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "0.10.0"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = version; - hash = "sha256-UJfAlSgH3xFqSOjJFon87YWd08nFgi1yYbEsCyMDVlA="; + hash = "sha256-VGPlOHQNtXrfmcne93xDIxN20KDGlTQrjeAKhX/L6K0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/monai-deploy/default.nix b/pkgs/development/python-modules/monai-deploy/default.nix new file mode 100644 index 0000000000000..a74fa36629dfe --- /dev/null +++ b/pkgs/development/python-modules/monai-deploy/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, pytest-lazy-fixture +, numpy +, networkx +, pydicom +, colorama +, typeguard +, versioneer +}: + +buildPythonPackage rec { + pname = "monai"; + version = "0.5.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Project-MONAI"; + repo = "monai-deploy-app-sdk"; + rev = "refs/tags/${version}"; + hash = "sha256-oaNZ0US0YR/PSwAZ5GfRpAW+HRYVhdCZI83fC00rgok="; + }; + + nativeBuildInputs = [ versioneer ]; + + propagatedBuildInputs = [ + numpy + networkx + colorama + typeguard + ]; + + nativeCheckInputs = [ pytestCheckHook pytest-lazy-fixture ]; + disabledTests = [ + # requires Docker daemon: + "test_packager" + ]; + pythonImportsCheck = [ + "monai.deploy" + "monai.deploy.core" + # "monai.deploy.operators" should be imported as well but + # requires some "optional" dependencies + # like highdicom (which is not packaged yet) and pydicom + ]; + + meta = with lib; { + description = "Framework and tools to design, develop and verify AI applications in healthcare imaging"; + homepage = "https://monai.io/deploy.html"; + license = licenses.asl20; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 19139af438900..5f5fc791baa42 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.14.2"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8EdAnHrgff+Xf7r/FuyGYZxpzEXusRTyXbNTNgPcHO0="; + hash = "sha256-pyGmzG2oy+1Ip4w+pyjASvVyZDEjDylBZfbxLPFzSoU="; }; # Requires libasan to be accessible diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index 09c69f9efb304..972b1a10b0b07 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -2,9 +2,11 @@ , buildPythonPackage , fetchPypi , pythonOlder +, pythonRelaxDepsHook , h5py , nibabel , numpy +, scipy , setuptools-scm , toml }: @@ -19,8 +21,11 @@ buildPythonPackage rec { hash = "sha256-iV9TEIGogIfbj+fmOGftoQqEdtZiewbHEw3hYlMEP4c="; }; + nativeBuildInputs = [ pythonRelaxDepsHook ]; buildInputs = [ setuptools-scm toml ]; - propagatedBuildInputs = [ h5py nibabel numpy ]; + propagatedBuildInputs = [ h5py nibabel numpy scipy ]; + + pythonRelaxDeps = [ "scipy" ]; doCheck = false; # relies on data repo (https://github.com/nipreps-data/nitransforms-tests); @@ -39,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://nitransforms.readthedocs.io"; description = "Geometric transformations for images and surfaces"; + changelog = "https://github.com/nipy/nitransforms/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix index d66d77fc77e7f..3697e6188ed24 100644 --- a/pkgs/development/python-modules/onvif-zeep-async/default.nix +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "onvif-zeep-async"; - version = "2.1.4"; + version = "3.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F8NqdEYz38mWSfOQ9oIjQccaGkON8skqm+ItQD71CPo="; + hash = "sha256-Lq8jYLEJKluRfsuRghkp7VPIcrHn3qaJTyid9O8lriA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 881280a1fca8e..e2cd47fa47a8e 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "0.14.3"; + version = "0.14.4"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-XOu17oydXwfyowYUmCKF7/RC0RQ0Uf1Ixmn+VTa85Lo="; + hash = "sha256-3U/PL8cnbNPw3xEM56YZesQEDXTE79yMCSsjdxwfUU0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 5fe452d2047fd..10e3cef7a69a8 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, scipy, six, decorator, nose }: +{ lib, buildPythonPackage, fetchpatch, fetchPypi, numpy, scipy, six, decorator, nose }: buildPythonPackage rec { pname = "paramz"; @@ -9,10 +9,19 @@ buildPythonPackage rec { sha256 = "0917211c0f083f344e7f1bc997e0d713dbc147b6380bc19f606119394f820b9a"; }; + patches = [ + (fetchpatch { + name = "remove-deprecated-numpy-uses"; + url = "https://github.com/sods/paramz/pull/38/commits/a5a0be15b12c5864b438d870b519ad17cc72cd12.patch"; + hash = "sha256-vj/amEXL9QJ7VdqJmyhv/lj8n+yuiZEARQBYWw6lgBA="; + }) + ]; + propagatedBuildInputs = [ numpy scipy six decorator ]; nativeCheckInputs = [ nose ]; - # Ran 113 tests in 3.082s + pythonImportsCheck = [ "paramz" ]; + checkPhase = '' nosetests -v paramz/tests ''; diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix index 46dd18b109fd6..a9ffc663fcaf0 100644 --- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -10,24 +9,31 @@ buildPythonPackage rec { pname = "pylibjpeg-libjpeg"; - version = "1.3.3"; + version = "1.3.4"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pydicom"; repo = pname; - rev = "refs/tags/v.${version}"; - hash = "sha256-fv3zX+P2DWMdxPKsvSPhPCV8cDX3tAMO/h5coMHBHN8="; + rev = "refs/tags/v${version}"; + hash = "sha256-VmqeoMU8riLpWyC+yKqq56TkruxOie6pjbg+ozivpBk="; fetchSubmodules = true; }; - nativeBuildInputs = [ cython]; + nativeBuildInputs = [ + cython + ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; nativeCheckInputs = [ pytestCheckHook ]; + doCheck = false; # tests try to import 'libjpeg.data', which errors pythonImportsCheck = [ @@ -37,7 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "A JPEG, JPEG-LS and JPEG XT plugin for pylibjpeg"; homepage = "https://github.com/pydicom/pylibjpeg-libjpeg"; - license = licenses.gpl3; + changelog = "https://github.com/pydicom/pylibjpeg-libjpeg/releases/tag/v${version}"; + license = licenses.gpl3Only; maintainers = with maintainers; [ bcdarwin ]; }; } diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index 54ada321371a8..2ebfa8238f391 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.25"; + version = "1.0.28"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AZpqV/CQ8TLKjaee9b0Zbu6WfnGNenKIvot+TTTSikg="; + hash = "sha256-7mYYsJCiJZedbmO9fv/Zr+QZOaSE6d6ld94yWUhUmUQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix new file mode 100644 index 0000000000000..174feb8b230d1 --- /dev/null +++ b/pkgs/development/python-modules/pyside6/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, cmake +, ninja +, qt6 +, python +, shiboken6 +, libxcrypt +}: + +stdenv.mkDerivation rec { + pname = "pyside6"; + + inherit (shiboken6) version src; + + sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; + + postPatch = '' + # Don't ignore optional Qt modules + substituteInPlace cmake/PySideHelpers.cmake \ + --replace \ + 'string(FIND "''${_module_dir}" "''${_core_abs_dir}" found_basepath)' \ + 'set (found_basepath 0)' + ''; + + nativeBuildInputs = [ + cmake + ninja + python + ]; + + buildInputs = with qt6; [ + # required + qtbase + # optional + qt3d + qtcharts + qtconnectivity + qtdatavis3d + qtdeclarative + qthttpserver + qtmultimedia + qtnetworkauth + qtquick3d + qtremoteobjects + qtscxml + qtsensors + qtspeech + qtsvg + qttools + qtwebchannel + qtwebengine + qtwebsockets + ] ++ lib.optionals (python.pythonOlder "3.9") [ + # see similar issue: 202262 + # libxcrypt is required for crypt.h for building older python modules + libxcrypt + ]; + + propagatedBuildInputs = [ + shiboken6 + ]; + + cmakeFlags = [ + "-DBUILD_TESTS=OFF" + ]; + + dontWrapQtApps = true; + + meta = with lib; { + description = "Python bindings for Qt"; + license = with licenses; [ lgpl3Only gpl2Only gpl3Only ]; + homepage = "https://wiki.qt.io/Qt_for_Python"; + maintainers = with maintainers; [ gebner Enzime ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index 9bc33c5755725..f4840bba20d2f 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-otbr-api"; - version = "1.0.9"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Rg5+EOsxRse618WvP4+9ybiu0mJpizrzCmeIbRnFgaA="; + hash = "sha256-0JPniehl4cnoTWgqmq1fMZwU8FFl2Zx4CF81az6iaxQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index ae21c55935899..e584461cd589e 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "2.1.0"; + version = "2.1.1"; disabled = isPy27; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9MIwNsiuWobgBaD2kXHz5nwBy04dxmxpF+7qfZ2l77M="; + hash = "sha256-XQ7lHhtcsqANuNVmjNMRjVdvwVo5hIVqTeNrnMF80uE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 46c99543a342a..8d3ea92339bfd 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.6.3"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-bRO2xO3Q9ruu5KY9SHwdhDU3DoZfW98uYiEFv5P0Fqc="; + hash = "sha256-wMDO0CUCSSCB8cXvTmIEWD8OGMZRZNhmmRx+fZnK288="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix new file mode 100644 index 0000000000000..ef59ff5bf2c64 --- /dev/null +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -0,0 +1,75 @@ +{ lib +, fetchurl +, llvmPackages +, python +, qt6 +, cmake +, autoPatchelfHook +, stdenv +, libxcrypt +}: + +llvmPackages.stdenv.mkDerivation rec { + pname = "shiboken6"; + version = "6.5.0"; + + src = fetchurl { + # https://download.qt.io/official_releases/QtForPython/shiboken6/ + url = "https://download.qt.io/official_releases/QtForPython/shiboken6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; + sha256 = "sha256-bvU7KRJyZ+OBkX5vk5nOdg7cBkTNWDGYix3nLJ1YOrQ="; + }; + + sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; + + patches = [ + ./fix-include-qt-headers.patch + ]; + + # Due to Shiboken.abi3.so being linked to libshiboken6.abi3.so.6.5 in the build tree, + # we need to remove the build tree reference from the RPATH and then add the correct + # directory to the RPATH. On Linux, the second part is handled by autoPatchelfHook. + # https://bugreports.qt.io/browse/PYSIDE-2233 + postBuild = '' + echo "fixing RPATH of Shiboken.abi3.so" + '' + (if stdenv.isDarwin then '' + invalid_rpaths=$(otool -l Shiboken.abi3.so | awk ' + /^[^ ]/ {f = 0} + $2 == "LC_RPATH" && $1 == "cmd" {f = 1} + f && gsub(/^ *path | \(offset [0-9]+\)$/, "") == 2 + ' | grep --invert-match /nix/store) + install_name_tool $(echo $invalid_rpaths | sed 's/^/-delete_rpath /' | tr '\n' ' ' | sed 's/ $//') Shiboken.abi3.so + install_name_tool -add_rpath $out/lib Shiboken.abi3.so + '' else '' + patchelf Shiboken.abi3.so --shrink-rpath --allowed-rpath-prefixes /nix/store + ''); + + cmakeFlags = [ + "-DBUILD_TESTS=OFF" + ]; + + dontWrapQtApps = true; + + nativeBuildInputs = [ + cmake + python + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + ]; + + buildInputs = [ + llvmPackages.llvm + llvmPackages.libclang + qt6.qtbase + ] ++ (lib.optionals (python.pythonOlder "3.9") [ + # see similar issue: 202262 + # libxcrypt is required for crypt.h for building older python modules + libxcrypt + ]); + + meta = with lib; { + description = "Generator for the pyside6 Qt bindings"; + license = with licenses; [ lgpl3Only gpl2Only gpl3Only ]; + homepage = "https://wiki.qt.io/Qt_for_Python"; + maintainers = with maintainers; [ gebner Enzime ]; + }; +} diff --git a/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch b/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch new file mode 100644 index 0000000000000..4c6d7bdad3fd4 --- /dev/null +++ b/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch @@ -0,0 +1,80 @@ +--- a/ApiExtractor/clangparser/compilersupport.cpp ++++ b/ApiExtractor/clangparser/compilersupport.cpp +@@ -16,6 +16,7 @@ + #include <QtCore/QStandardPaths> + #include <QtCore/QStringList> + #include <QtCore/QVersionNumber> ++#include <QtCore/QRegularExpression> + + #include <clang-c/Index.h> + +@@ -341,6 +342,13 @@ QByteArrayList emulatedCompilerOptions() + { + QByteArrayList result; + HeaderPaths headerPaths; ++ ++ bool isNixDebug = qgetenv("NIX_DEBUG").toInt() > 0; ++ // examples: ++ // /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-qtsensors-6.4.2-dev/include ++ // /nix/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-qtbase-6.4.2-dev/include ++ QRegularExpression qtHeaderRegex(uR"(/[0-9a-z]{32}-qt[a-z0-9]+-)"_s); ++ + switch (compiler()) { + case Compiler::Msvc: + result.append(QByteArrayLiteral("-fms-compatibility-version=19.26.28806")); +@@ -352,9 +360,30 @@ QByteArrayList emulatedCompilerOptions() + appendClangBuiltinIncludes(&headerPaths); + break; + case Compiler::Clang: +- headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s))); ++ // fix: error: cannot jump from switch statement to this case label: case Compiler::Gpp ++ // note: jump bypasses variable initialization: const HeaderPaths clangPaths = ++ { ++ //headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s))); ++ // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors. ++ // PySide requires that Qt headers are not -isystem ++ // https://bugreports.qt.io/browse/PYSIDE-787 ++ const HeaderPaths clangPaths = gppInternalIncludePaths(compilerFromCMake(u"clang++"_qs)); ++ for (const HeaderPath &h : clangPaths) { ++ auto match = qtHeaderRegex.match(QString::fromUtf8(h.path)); ++ if (!match.hasMatch()) { ++ if (isNixDebug) ++ qDebug() << "shiboken compilersupport.cpp: found non-qt header: " << h.path; ++ // add using -isystem ++ headerPaths.append(h); ++ } else { ++ if (isNixDebug) ++ qDebug() << "shiboken compilersupport.cpp: found qt header: " << h.path; ++ headerPaths.append({h.path, HeaderType::Standard}); ++ } ++ } + result.append(noStandardIncludeOption()); + break; ++ } + case Compiler::Gpp: + if (needsClangBuiltinIncludes()) + appendClangBuiltinIncludes(&headerPaths); +@@ -363,8 +392,20 @@ QByteArrayList emulatedCompilerOptions() + // <type_traits> etc (g++ 11.3). + const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(u"g++"_qs)); + for (const HeaderPath &h : gppPaths) { +- if (h.path.contains("c++") || h.path.contains("sysroot")) ++ // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors. ++ // PySide requires that Qt headers are not -isystem ++ // https://bugreports.qt.io/browse/PYSIDE-787 ++ auto match = qtHeaderRegex.match(QString::fromUtf8(h.path)); ++ if (!match.hasMatch()) { ++ if (isNixDebug) ++ qDebug() << "shiboken compilersupport.cpp: found non-qt header: " << h.path; ++ // add using -isystem + headerPaths.append(h); ++ } else { ++ if (isNixDebug) ++ qDebug() << "shiboken compilersupport.cpp: found qt header: " << h.path; ++ headerPaths.append({h.path, HeaderType::Standard}); ++ } + } + break; + } +-- +2.39.0 diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index 793bf0771b1aa..b5d58792477db 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.24.1"; + version = "0.25"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OdLkvEDV4JMSYSmhRPVrbuFfWM+lBItZSOY6Ea/ztYY="; + hash = "sha256-j95THZLRz8KBf+Nkez8tB+dmgsSoSInASlPoMffFRDI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/transforms3d/default.nix b/pkgs/development/python-modules/transforms3d/default.nix index 549ad85c78e98..6bab6a5148b51 100644 --- a/pkgs/development/python-modules/transforms3d/default.nix +++ b/pkgs/development/python-modules/transforms3d/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 -, pytest +, pythonOlder +, pytestCheckHook , numpy , scipy , sympy @@ -10,22 +10,22 @@ buildPythonPackage rec { pname = "transforms3d"; - version = "unstable-2019-12-17"; + version = "0.4.1"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; - # no Git tag or PyPI release in some time src = fetchFromGitHub { owner = "matthew-brett"; repo = pname; - rev = "6b20250c610249914ca5e3a3a2964c36ca35c19a"; - sha256 = "1z789hgk71a6rj6mqp9srpzamg06g58hs2p1l1p344cfnkj5a4kc"; + rev = "refs/tags/${version}"; + hash = "sha256-GgnjvwAfyxnDfBGvgMFIPPbR88BWFiNGrScVORygq94="; }; propagatedBuildInputs = [ numpy sympy ]; - nativeCheckInputs = [ pytest scipy ]; - checkPhase = "pytest transforms3d"; + nativeCheckInputs = [ pytestCheckHook scipy ]; + pythonImportsCheck = [ "transforms3d" ]; meta = with lib; { homepage = "https://matthew-brett.github.io/transforms3d"; diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 133c9401a2934..27356372fce02 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -17,20 +17,20 @@ buildPythonPackage rec { pname = "volvooncall"; - version = "0.10.2"; + version = "0.10.3"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "molobrakos"; repo = "volvooncall"; rev = "refs/tags/v${version}"; - hash = "sha256-/BMwDuo4xE/XOLM8qzJwt0A0h0+ihbCVCxT3BBToiVU="; + hash = "sha256-FLrsU3u/0+T09cu2zU2fLjuAy9PWAikgbaW8xBALjwU="; }; patches = [ - # Remove async, https://github.com/molobrakos/volvooncall/pull/92 + # Remove asynctest, https://github.com/molobrakos/volvooncall/pull/92 (fetchpatch { name = "remove-asnyc.patch"; url = "https://github.com/molobrakos/volvooncall/commit/ef0df403250288c00ed4c600e9dfa79dcba8941e.patch"; @@ -67,6 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Retrieve information from the Volvo On Call web service"; homepage = "https://github.com/molobrakos/volvooncall"; + changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${version}"; license = licenses.unlicense; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/xnatpy/default.nix b/pkgs/development/python-modules/xnatpy/default.nix new file mode 100644 index 0000000000000..4738f137d427d --- /dev/null +++ b/pkgs/development/python-modules/xnatpy/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, click +, isodate +, progressbar2 +, pydicom +, requests +}: + +buildPythonPackage rec { + pname = "xnatpy"; + version = "0.5.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "xnat"; + inherit version; + hash = "sha256-iOw9cVWP5Am4S9JQ0NTmtew38KZiKmau+19K2KG2aKQ="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + click + isodate + progressbar2 + pydicom + requests + ]; + + # tests missing in PyPI dist and require network access and Docker container + doCheck = false; + + pythonImportsCheck = [ "xnat" ]; + + meta = with lib; { + homepage = "https://xnat.readthedocs.io"; + description = + "A new XNAT client (distinct from pyxnat) that exposes XNAT objects/functions as Python objects/functions"; + changelog = "https://gitlab.com/radiology/infrastructure/xnatpy/-/blob/${version}/CHANGELOG?ref_type=tags"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + mainProgram = "xnat"; + }; +} diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 908c608720592..b48ca6fe9f615 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.234"; + version = "2.3.237"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PLeqYD9aIv/nmFvfW2QjDz1xDD2PIFUvr9lkQ2Rh6k8="; + hash = "sha256-7ugTfWv6CRj5vsrT1DvfaR39Ytct3tse+2210WBHP9g="; }; patches = [ diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 362907a4941c6..50e9f240ba1d9 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -3,22 +3,24 @@ , fetchFromGitHub , pkg-config , bzip2 +, xz +, zstd , stdenv , rustup }: rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-fpOBSMVBkuFJcog5g5qFO/0GI78GkkwWQC7zocrVJ2w="; + hash = "sha256-uXC+iaOcEIyGMVNtAduhT68GuE29aL/3S6uEMllAWNA="; }; - cargoHash = "sha256-BqbF21OotztNZsol6wlTDzfz0ViybPF5KK/v+F9N5Us="; + cargoHash = "sha256-/TLi+ESOZhJ4Xg3hdUEWhM0K4asI9+L1M1+hWuDOj9Q="; nativeBuildInputs = [ pkg-config @@ -26,8 +28,14 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 + xz + zstd ]; + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + nativeCheckInputs = lib.optionals stdenv.isDarwin [ rustup ]; diff --git a/pkgs/games/wireworld/default.nix b/pkgs/games/wireworld/default.nix new file mode 100644 index 0000000000000..5528b52a280af --- /dev/null +++ b/pkgs/games/wireworld/default.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitLab +, zip +, love +, makeWrapper +, makeDesktopItem +, copyDesktopItems +}: + +stdenv.mkDerivation rec { + pname = "wireworld"; + version = "unstable-2023-05-09"; + + src = fetchFromGitLab { + owner = "blinry"; + repo = pname; + rev = "03b82bf5d604d6d4ad3c07b224583de6c396fd17"; + hash = "sha256-8BshnGLuA8lmG9g7FU349DWKP/fZvlvjrQBau/LSJ4E="; + }; + + nativeBuildInputs = [ makeWrapper copyDesktopItems zip ]; + + desktopItems = [ + (makeDesktopItem { + name = "Wireworld"; + exec = pname; + comment = ""; + desktopName = "Wireworld"; + genericName = "Wireworld"; + categories = [ "Game" ]; + }) + ]; + + installPhase = '' + runHook preInstall + zip -9 -r Wireworld.love ./* + install -Dm444 -t $out/share/games/lovegames/ Wireworld.love + makeWrapper ${love}/bin/love $out/bin/Wireworld \ + --add-flags $out/share/games/lovegames/Wireworld.love + runHook postInstall + ''; + + meta = with lib; { + description = "Fascinating electronics logic puzzles, game where you'll learn how to build clocks, diodes, and logic gates"; + license = with licenses; [ + mit + ofl + blueOak100 + cc-by-sa-30 + cc-by-sa-40 + ]; + downloadPage = "https://ldjam.com/events/ludum-dare/53/wireworld"; + maintainers = with lib.maintainers; [ janik ]; + }; + +} diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix index fdcadc4bb28df..1a66d8f28de95 100644 --- a/pkgs/servers/tang/default.nix +++ b/pkgs/servers/tang/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "tang"; - version = "12"; + version = "13"; src = fetchFromGitHub { owner = "latchset"; repo = "tang"; rev = "refs/tags/v${version}"; - hash = "sha256-wfZFOJrVzjtysh0VKdw5O+DJybYkV9bYJNnaku6YctE="; + hash = "sha256-SOdgMUWavTaDUiVvpEyE9ac+9aDmZs74n7ObugksBcc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index 753934672f410..5c4762183970d 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -18,7 +18,7 @@ let owner = "chriskohlhoff"; repo = "asio"; rev = "refs/tags/asio-1-22-1"; - sha256 = "sha256-UDLhx2yI6Txg0wP5H4oNIhgKIB2eMxUGCyT2x/7GgVg="; + hash = "sha256-UDLhx2yI6Txg0wP5H4oNIhgKIB2eMxUGCyT2x/7GgVg="; }; # Derived from subprojects/bitsery.wrap @@ -26,7 +26,7 @@ let owner = "fraillt"; repo = "bitsery"; rev = "refs/tags/v5.2.2"; - sha256 = "sha256-VwzVtxt+E/SVcxqIJw8BKPO2q7bu/hkhY+nB7FHrZpY="; + hash = "sha256-VwzVtxt+E/SVcxqIJw8BKPO2q7bu/hkhY+nB7FHrZpY="; }; # Derived from subprojects/clap.wrap @@ -34,7 +34,7 @@ let owner = "free-audio"; repo = "clap"; rev = "refs/tags/1.1.7"; - sha256 = "sha256-WcMTxE+QCzlp4lhFdghZI8UI/5mdVeRvrl24Xynd0qk="; + hash = "sha256-WcMTxE+QCzlp4lhFdghZI8UI/5mdVeRvrl24Xynd0qk="; }; # Derived from subprojects/function2.wrap @@ -42,7 +42,7 @@ let owner = "Naios"; repo = "function2"; rev = "refs/tags/4.2.0"; - sha256 = "sha256-wrt+fCcM6YD4ZRZYvqqB+fNakCNmltdPZKlNkPLtgMs="; + hash = "sha256-wrt+fCcM6YD4ZRZYvqqB+fNakCNmltdPZKlNkPLtgMs="; }; # Derived from subprojects/ghc_filesystem.wrap @@ -50,7 +50,7 @@ let owner = "gulrak"; repo = "filesystem"; rev = "refs/tags/v1.5.12"; - sha256 = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE="; + hash = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE="; }; # Derived from subprojects/tomlplusplus.wrap @@ -58,7 +58,7 @@ let owner = "marzer"; repo = "tomlplusplus"; rev = "refs/tags/v3.3.0"; - sha256 = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M="; + hash = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M="; }; # Derived from vst3.wrap @@ -67,19 +67,19 @@ let repo = "vst3sdk"; rev = "refs/tags/v3.7.7_build_19-patched"; fetchSubmodules = true; - sha256 = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU="; + hash = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU="; }; in multiStdenv.mkDerivation (finalAttrs: { pname = "yabridge"; - version = "5.0.4"; + version = "5.0.5"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = "yabridge"; rev = "refs/tags/${finalAttrs.version}"; - sha256 = "sha256-15WTCXMvghoU5TkE8yuQJrxj9cwVjczDKGKWjoUS6SI="; + hash = "sha256-SB2/zKxj9GDOOb3Zn4kWj7dXhDg/wbx6nPKYbQ041Cs="; }; # Unpack subproject sources diff --git a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch index 6dd23d7f370de..c657cd7d56b27 100644 --- a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch +++ b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch @@ -1,5 +1,5 @@ diff --git a/meson.build b/meson.build -index f76f5acf..045e9d40 100644 +index d8d9135b..717280d9 100644 --- a/meson.build +++ b/meson.build @@ -221,7 +221,7 @@ if is_64bit_system @@ -12,10 +12,10 @@ index f76f5acf..045e9d40 100644 # These are all headers-only libraries, and thus won't require separate 32-bit diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp -index 8d6236ad..ea5c1396 100644 +index 4a52b6c1..abbb1ec8 100644 --- a/src/plugin/utils.cpp +++ b/src/plugin/utils.cpp -@@ -93,7 +93,7 @@ std::string PluginInfo::wine_version() const { +@@ -101,7 +101,7 @@ std::string PluginInfo::wine_version() const { // The '*.exe' scripts generated by winegcc allow you to override the binary // used to run Wine, so will will handle this in the same way for our Wine // version detection. We'll be using `execvpe` diff --git a/pkgs/tools/audio/yabridgectl/Cargo.lock b/pkgs/tools/audio/yabridgectl/Cargo.lock index ecadbfde7fa99..e5eeca5a3db04 100644 --- a/pkgs/tools/audio/yabridgectl/Cargo.lock +++ b/pkgs/tools/audio/yabridgectl/Cargo.lock @@ -835,7 +835,7 @@ dependencies = [ [[package]] name = "yabridgectl" -version = "5.0.4" +version = "5.0.5" dependencies = [ "anyhow", "clap", diff --git a/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/pkgs/tools/misc/calamares-nixos-extensions/default.nix index ad21c398fe9f8..455d1b223a7ca 100644 --- a/pkgs/tools/misc/calamares-nixos-extensions/default.nix +++ b/pkgs/tools/misc/calamares-nixos-extensions/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "calamares-nixos-extensions"; - version = "0.3.11"; + version = "0.3.12"; src = fetchFromGitHub { owner = "NixOS"; repo = "calamares-nixos-extensions"; rev = version; - sha256 = "NAHUU0tQLu8c2dke1V0aM3mHrNgM8ekHSB2Fo9dQUk8="; + sha256 = "qNRlUz4+xxNNzyswKHOjbkaLx0qi8fiAly94fMOlryE="; }; installPhase = '' diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix deleted file mode 100644 index 559eec9bbdd06..0000000000000 --- a/pkgs/tools/misc/grub/trusted.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchFromGitHub -, fetchpatch -, autogen -, flex -, bison -, python2 -, autoconf -, automake -, gettext -, ncurses -, libusb-compat-0_1 -, freetype -, qemu -, lvm2 -, for_HP_laptop ? false -}: - -let - pcSystems = { - i686-linux.target = "i386"; - x86_64-linux.target = "i386"; - }; - - inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (lib.mapAttrsToList (name: _: name) pcSystems); - - version = if for_HP_laptop then "1.2.1" else "1.2.0"; - - unifont_bdf = fetchurl { - url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; - sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx"; - }; - - po_src = fetchurl { - name = "grub-2.02-beta2.tar.gz"; - url = "https://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.gz"; - sha256 = "1lr9h3xcx0wwrnkxdnkfjwy08j7g7mdlmmbdip2db4zfgi69h0rm"; - - }; - -in - -stdenv.mkDerivation rec { - pname = "trustedGRUB2"; - inherit version; - - src = fetchFromGitHub { - owner = "Sirrix-AG"; - repo = "TrustedGRUB2"; - rev = version; - sha256 = - if for_HP_laptop - then "sha256-H1JzT/RgnbHqnW2/FmvXFuI6gnHI2vQU3W1iq2FqwJw=" - else "sha256-k8DGHjTIpnjWw7GNN2kyR8rRl2MAq1xkfOndd0znLns="; - }; - - nativeBuildInputs = [ autogen flex bison python2 autoconf automake ]; - buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] - ++ lib.optional doCheck qemu; - - hardeningDisable = [ "stackprotector" "pic" ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-error"; # generated code redefines yyfree - - preConfigure = - '' for i in "tests/util/"*.in - do - sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g' - done - - # Apparently, the QEMU executable is no longer called - # `qemu-system-i386', even on i386. - # - # In addition, use `-nodefaults' to avoid errors like: - # - # chardev: opening backend "stdio" failed - # qemu: could not open serial device 'stdio': Invalid argument - # - # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>. - sed -i "tests/util/grub-shell.in" \ - -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' - ''; - - prePatch = - '' tar zxf ${po_src} grub-2.02~beta2/po - rm -rf po - mv grub-2.02~beta2/po po - sh autogen.sh - gunzip < "${unifont_bdf}" > "unifont.bdf" - sed -i "configure" \ - -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" - ''; - - patches = [ - ./fix-bash-completion.patch - (fetchpatch { - # glibc-2.26 and above needs '<sys/sysmacros.h>' - url = "https://github.com/Rohde-Schwarz/TrustedGRUB2/commit/7a5b301e3adb8e054288518a325135a1883c1c6c.patch"; - sha256 = "1jfrrmcrd9a8w7n419kszxgbpshx7888wc05smg5q4jvc1ag3xm7"; - }) - ]; - - # save target that grub is compiled for - grubTarget = lib.optionalString inPCSystems "${pcSystems.${stdenv.hostPlatform.system}.target}-pc"; - - doCheck = false; - # On -j16 races with early header creation: - # config.h:38:10: fatal error: ./config-util.h: No such file or directory - enableParallelBuilding = false; - - meta = with lib; { - description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)"; - homepage = "https://github.com/Sirrix-AG/TrustedGRUB2"; - license = licenses.gpl3Plus; - platforms = platforms.gnu ++ platforms.linux; - }; -} diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index 584ad029970e6..9483c3ce756d8 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { installShellFiles ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + installPhase = '' mkdir -p $out/bin cp nuttcp-${version} $out/bin/nuttcp diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 08622c30e6da4..a4d78a15a3af9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1657,6 +1657,8 @@ mapAliases ({ trebleshot = throw "trebleshot has been removed. It was archived upstream, so it's considered abandoned"; trilium = throw "trilium has been removed. Please use trilium-desktop instead"; # Added 2020-04-29 truecrypt = throw "'truecrypt' has been renamed to/replaced by 'veracrypt'"; # Converted to throw 2022-02-22 + trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 + trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07 turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08 tvbrowser-bin = tvbrowser; # Added 2023-03-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b52924cb15ed..0dd58a7bd2855 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8170,10 +8170,6 @@ with pkgs; grpc-client-cli = callPackage ../development/tools/misc/grpc-client-cli { }; - trustedGrub = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { }; - - trustedGrub-for-HP = pkgsi686Linux.callPackage ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; - grub2 = callPackage ../tools/misc/grub/default.nix { # update breaks grub2 gnulib = pkgs.gnulib.overrideAttrs (_: rec { @@ -20752,6 +20748,8 @@ with pkgs; gnome-menus = callPackage ../development/libraries/gnome-menus { }; + gnote = callPackage ../applications/office/gnote { }; + elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; gtk2 = callPackage ../development/libraries/gtk/2.x.nix { @@ -40052,6 +40050,9 @@ with pkgs; wiremock = callPackage ../tools/networking/wiremock { }; + wireworld = callPackage ../games/wireworld { }; + + teseq = callPackage ../applications/misc/teseq { }; ape = callPackage ../applications/misc/ape { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26b7aee601cbe..1a6d936c7b4fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6289,6 +6289,8 @@ self: super: with self; { monai = callPackage ../development/python-modules/monai { }; + monai-deploy = callPackage ../development/python-modules/monai-deploy { }; + monero = callPackage ../development/python-modules/monero { }; mongomock = callPackage ../development/python-modules/mongomock { }; @@ -9175,6 +9177,10 @@ self: super: with self; { inherit (pkgs) cmake ninja qt5; }); + pyside6 = toPythonModule (callPackage ../development/python-modules/pyside6 { + inherit (pkgs) cmake ninja qt6; + }); + pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; @@ -10953,6 +10959,10 @@ self: super: with self; { inherit (pkgs) cmake llvmPackages qt5; }); + shiboken6 = toPythonModule (callPackage ../development/python-modules/shiboken6 { + inherit (pkgs) cmake llvmPackages qt6; + }); + shippai = callPackage ../development/python-modules/shippai { }; shiv = callPackage ../development/python-modules/shiv { }; @@ -13008,6 +13018,8 @@ self: super: with self; { xmodem = callPackage ../development/python-modules/xmodem { }; + xnatpy = callPackage ../development/python-modules/xnatpy { }; + xnd = callPackage ../development/python-modules/xnd { }; xpath-expressions = callPackage ../development/python-modules/xpath-expressions { }; |