diff options
81 files changed, 160 insertions, 361 deletions
diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index cd1a445f47b3..9eefcbe7e546 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.49.0"; - hash = "sha256-KI4ZRy1DZi2C1UeNDVeoDRn/GsHjHmpyNnno+gO/eDE="; + version = "3.51.0"; + hash = "sha256-/WqW0hjerbNM9TtgpNV+usDUajIhRd3y+zeYxJi0COc="; }; meta = { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 480a21b6afb8..3ef4e1b8d38b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,11 +110,11 @@ "vendorHash": null }, "bpg_proxmox": { - "hash": "sha256-d0v0a4t0sPkGQ9LGK7p5XZmuZBuBeLcWHBoslFu9Qs8=", + "hash": "sha256-eRed1lShDIpQRCC/JvqT5uYbDU+mgpMfEPiSQFoV1QA=", "homepage": "https://registry.terraform.io/providers/bpg/proxmox", "owner": "bpg", "repo": "terraform-provider-proxmox", - "rev": "v0.92.0", + "rev": "v0.93.0", "spdx": "MPL-2.0", "vendorHash": "sha256-+UWPbNHoV3TdeMZdY0ZOLBe1/Dej37hHORatC9Kol58=" }, @@ -1193,13 +1193,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "selectel_selectel": { - "hash": "sha256-2lo5CF+FmQW2JIHCoI5zGZBaquIo4RXzvD8MeNWTHhQ=", + "hash": "sha256-BT8sDYfcEtsvMg1aLi2QRo4wu2V/hkWEk4PKQmN3vtg=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v7.3.0", + "rev": "v7.4.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-wAVTsN0ZizBU4dMLK2wxf3RSNE6GCbXL1jTIULpKfNU=" + "vendorHash": "sha256-OJlD1P+CUEsLk2xSsQ2QQBvGewYNly1dIJh8kMi+ChE=" }, "siderolabs_talos": { "hash": "sha256-NsIFyngT6/bU744fftNWWHU43W3sXO/0yzzAKSEH9/Q=", diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 7af21f996747..433d1e8a039e 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "cdncheck"; - version = "1.2.18"; + version = "1.2.19"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${finalAttrs.version}"; - hash = "sha256-RFA/5fCh9csa6nYoVmuZ5vs6JCaTVFUuEz0E8w7Rb/s="; + hash = "sha256-gb+M/y1MADwCR9gz1+mSXbvE3sSV8FKTDSz+Y9U2gfU="; }; vendorHash = "sha256-Tc8qrML7u5qE0zVe7JCL1BM0KbhJSwnjhnd2gX5YUaA="; diff --git a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix index 2e346a8f15b9..5ad79d16caf4 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-weather/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-weather"; - version = "0-unstable-2025-12-03"; + version = "0-unstable-2026-01-17"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "cosmic-ext-applet-weather"; - rev = "289d866abaaeaf51e9b7074b7731bcd6e5ea4b55"; - hash = "sha256-LeUzDjUiDt3lQiQQvDB9RlSC1F4IyXTE4lc17eQd+Sw="; + rev = "142666f73c702036438408758ea86ec22d63611b"; + hash = "sha256-K4flguR6pknhFCpwHQ+4OtSAtPBjUag1g/uUnCNM3Pw="; }; - cargoHash = "sha256-1lIWzCqpIxk+FWA/84yN/x10Se2xRTZ7KEqAWVgfFgU="; + cargoHash = "sha256-LcTUIhAWitLFz23TasfSJt6tOAAAJDiHxfTcxBX2/Bg="; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/de/deface/package.nix b/pkgs/by-name/de/deface/package.nix index dc40f47ecf93..2194ec221124 100644 --- a/pkgs/by-name/de/deface/package.nix +++ b/pkgs/by-name/de/deface/package.nix @@ -11,8 +11,6 @@ python3.pkgs.buildPythonApplication rec { version = "1.5.0"; pyproject = true; - disabled = python3.pythonOlder "3.8"; - src = fetchFromGitHub { owner = "ORB-HD"; repo = "deface"; diff --git a/pkgs/by-name/dt/dt-schema/package.nix b/pkgs/by-name/dt/dt-schema/package.nix index 446e47f7b9ef..6aacd1306435 100644 --- a/pkgs/by-name/dt/dt-schema/package.nix +++ b/pkgs/by-name/dt/dt-schema/package.nix @@ -1,5 +1,4 @@ { - lib, python3, }: @@ -16,22 +15,10 @@ let hash = "sha256-D4ZEN6uLYHa6ZwdFPvj5imoNUSqA6T+KvbZ29zfstg0="; }; - propagatedBuildInputs = - with self; - ( - [ - attrs - pyrsistent - ] - ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - typing-extensions - ] - ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources - pkgutil-resolve-name - ] - ); + propagatedBuildInputs = with self; [ + attrs + pyrsistent + ]; }); }; }; diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix index 5545eedc7434..114abc7584e4 100644 --- a/pkgs/by-name/go/gogdl/package.nix +++ b/pkgs/by-name/go/gogdl/package.nix @@ -18,8 +18,6 @@ python3Packages.buildPythonApplication rec { hash = "sha256-pK6JeTJeBq9qVfflNSYs3s4HuD0Kz6k9DDUVHL81FV0="; }; - disabled = python3Packages.pythonOlder "3.8"; - propagatedBuildInputs = with python3Packages; [ setuptools requests diff --git a/pkgs/by-name/go/gogh/package.nix b/pkgs/by-name/go/gogh/package.nix index dff132dd444d..a51792f20d0c 100644 --- a/pkgs/by-name/go/gogh/package.nix +++ b/pkgs/by-name/go/gogh/package.nix @@ -25,13 +25,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "gogh"; - version = "362"; + version = "364"; src = fetchFromGitHub { owner = "Gogh-Co"; repo = "Gogh"; tag = "v${finalAttrs.version}"; - hash = "sha256-FlMf7CzdGcGor+wi293CW2PT14O1VRzQbbxnNMmwFqk="; + hash = "sha256-DVaUmpXWGb+bIdGZqXbiAsiuGTrwvPJdxCyA4g82LFA="; }; postPatch = '' diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index 1c98d0bed83d..e57161c3d9f6 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-8dRnGr9nVu+GNIVcH90iPDF0VoMibiKqL6dGRdmZl94="; + hash = "sha256-GLoGdZ/UWtkWt4WjjhmupQzPQTMuQI+7jb7IjSCcvo0="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/im/imgp/package.nix b/pkgs/by-name/im/imgp/package.nix index e06fcf19c7bb..ed0a272b2241 100644 --- a/pkgs/by-name/im/imgp/package.nix +++ b/pkgs/by-name/im/imgp/package.nix @@ -8,7 +8,6 @@ python3Packages.buildPythonApplication rec { pname = "imgp"; version = "2.9"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "jarun"; diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 082cd77da9c5..b6960bceed6b 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "jjui"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; tag = "v${finalAttrs.version}"; - hash = "sha256-kBhEX6k/1vVhSqKeUcIQp6sOpKDnJfgUNKOTzbjG/VI="; + hash = "sha256-Hsuyf5VcSZcNi2gmubXS47uRarL17oPEtorisY75bbM="; }; vendorHash = "sha256-jte0g+aUiGNARLi8DyfsX6wYYJnodHnILzmid6KvMiA="; diff --git a/pkgs/by-name/le/legendary-gl/package.nix b/pkgs/by-name/le/legendary-gl/package.nix index cf0c0dc8bb79..0f46e05b024f 100644 --- a/pkgs/by-name/le/legendary-gl/package.nix +++ b/pkgs/by-name/le/legendary-gl/package.nix @@ -26,8 +26,6 @@ python3Packages.buildPythonApplication { filelock ]; - disabled = python3Packages.pythonOlder "3.8"; - # no tests doCheck = false; diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index 50f45c37b661..1c1465454fb0 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -9,7 +9,6 @@ python3Packages.buildPythonApplication rec { pname = "mapproxy"; version = "5.1.1"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mapproxy"; diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 3877924bfac4..fe7ab9c868bb 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -47,14 +47,14 @@ assert python.pkgs.buildPythonApplication rec { pname = "music-assistant"; - version = "2.7.3"; + version = "2.7.5"; pyproject = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; tag = version; - hash = "sha256-6D3B88wjfVHvNhNrTDOu77eAkherOqdBVafUhht7okA="; + hash = "sha256-iWdOGdmPJO7Pjdn8UjuSOhWnRGBFjmARFsuHmP6IP58="; }; patches = [ diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index a40106dec226..0ad1828c4768 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,7 +1,7 @@ # Do not edit manually, run ./update-providers.py { - version = "2.7.3"; + version = "2.7.5"; providers = { airplay = ps: [ ]; @@ -134,6 +134,7 @@ sendspin = ps: with ps; [ aiosendspin + av ]; siriusxm = ps: [ ]; # missing sxm diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index 6cfac71c071e..3700f96f4a3e 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -33,8 +33,6 @@ python.pkgs.buildPythonApplication rec { version = "2.26.2"; pyproject = true; - disabled = python.pkgs.pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm"; diff --git a/pkgs/by-name/pg/pg_activity/package.nix b/pkgs/by-name/pg/pg_activity/package.nix index 8244a42fb6ec..345e64177ba7 100644 --- a/pkgs/by-name/pg/pg_activity/package.nix +++ b/pkgs/by-name/pg/pg_activity/package.nix @@ -8,7 +8,6 @@ python3Packages.buildPythonApplication rec { pname = "pg_activity"; version = "3.6.1"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "dalibo"; diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix index 6f94c7abc528..435c3e02ee79 100644 --- a/pkgs/by-name/po/portablemc/package.nix +++ b/pkgs/by-name/po/portablemc/package.nix @@ -50,8 +50,6 @@ python3Packages.buildPythonApplication rec { version = "4.4.1"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; - src = fetchFromGitHub { owner = "mindstorm38"; repo = "portablemc"; diff --git a/pkgs/by-name/ra/rapid-photo-downloader/package.nix b/pkgs/by-name/ra/rapid-photo-downloader/package.nix index 8e86020d2354..ea9ccb492f23 100644 --- a/pkgs/by-name/ra/rapid-photo-downloader/package.nix +++ b/pkgs/by-name/ra/rapid-photo-downloader/package.nix @@ -36,35 +36,32 @@ python3Packages.buildPythonApplication rec { setuptools ]; - dependencies = - with python3Packages; - [ - ifuse - libimobiledevice - # Python dependencies - pyqt5 - pygobject3 - gphoto2 - pyzmq - tornado - psutil - pyxdg - arrow - python-dateutil - easygui - babel - colour - pillow - pymediainfo - sortedcontainers - requests - colorlog - pyprind - setuptools - show-in-file-manager - tenacity - ] - ++ lib.optional (pythonOlder "3.8") importlib-metadata; + dependencies = with python3Packages; [ + ifuse + libimobiledevice + # Python dependencies + pyqt5 + pygobject3 + gphoto2 + pyzmq + tornado + psutil + pyxdg + arrow + python-dateutil + easygui + babel + colour + pillow + pymediainfo + sortedcontainers + requests + colorlog + pyprind + setuptools + show-in-file-manager + tenacity + ]; postPatch = '' # Drop broken version specifier diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix index f5a17eb0c58c..38bd3102085a 100644 --- a/pkgs/by-name/sq/sqlfluff/package.nix +++ b/pkgs/by-name/sq/sqlfluff/package.nix @@ -22,31 +22,25 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "click" ]; - dependencies = - with python3Packages; - [ - appdirs - cached-property - chardet - click - colorama - configparser - diff-cover - jinja2 - oyaml - pathspec - platformdirs - pytest - regex - tblib - toml - tqdm - typing-extensions - ] - ++ lib.optionals (pythonOlder "3.8") [ - backports.cached-property - importlib_metadata - ]; + dependencies = with python3Packages; [ + appdirs + cached-property + chardet + click + colorama + configparser + diff-cover + jinja2 + oyaml + pathspec + platformdirs + pytest + regex + tblib + toml + tqdm + typing-extensions + ]; nativeCheckInputs = with python3Packages; [ hypothesis diff --git a/pkgs/by-name/st/stac-validator/package.nix b/pkgs/by-name/st/stac-validator/package.nix index c3ed965e8e27..1ea6972fc9c2 100644 --- a/pkgs/by-name/st/stac-validator/package.nix +++ b/pkgs/by-name/st/stac-validator/package.nix @@ -8,7 +8,6 @@ python3Packages.buildPythonPackage rec { pname = "stac-validator"; version = "3.10.2"; pyproject = true; - disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "stac-utils"; diff --git a/pkgs/by-name/tc/tcpdump/package.nix b/pkgs/by-name/tc/tcpdump/package.nix index 9ad88b6d7a4f..c7d04ae911ca 100644 --- a/pkgs/by-name/tc/tcpdump/package.nix +++ b/pkgs/by-name/tc/tcpdump/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "tcpdump"; - version = "4.99.5"; + version = "4.99.6"; src = fetchurl { url = "https://www.tcpdump.org/release/tcpdump-${version}.tar.gz"; - hash = "sha256-jHWFbgCt3urfcNrWfJ/z3TaFNrK4Vjq/aFTXx2TNOts="; + hash = "sha256-WDmSGg9n19j6PazZzUHkTInMuGfoptshbWJijH/RSwk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index 08e7496cd6bb..531249d9d727 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -3,14 +3,12 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, mpmath, numpy, pybind11, pyfma, eigen, - importlib-metadata, pytestCheckHook, matplotlib, dufte, @@ -40,8 +38,7 @@ buildPythonPackage rec { mpmath numpy pyfma - ] - ++ lib.optional (pythonOlder "3.8") importlib-metadata; + ]; nativeCheckInputs = [ perfplot diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 3f518fe0f54d..517e10840aba 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -11,9 +11,9 @@ pythonOlder, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiolifx-themes"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Djelibeybi"; repo = "aiolifx-themes"; - tag = "v${version}"; - hash = "sha256-uJQWKgmlNwuvIXfK6fFHngaSncgaDJJ36vkOLGWB/lY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Y92ze+zrkz+fxQNFFSR5V9sPJMN0/dfIRwT6UhXo0+U="; }; build-system = [ poetry-core ]; @@ -41,8 +41,8 @@ buildPythonPackage rec { meta = { description = "Color themes for LIFX lights running on aiolifx"; homepage = "https://github.com/Djelibeybi/aiolifx-themes"; - changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/${src.tag}"; + changelog = "https://github.com/Djelibeybi/aiolifx-themes/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lukegb ]; }; -} +}) diff --git a/pkgs/development/python-modules/aiosendspin/default.nix b/pkgs/development/python-modules/aiosendspin/default.nix index 752a8aeaf527..aba70a364c09 100644 --- a/pkgs/development/python-modules/aiosendspin/default.nix +++ b/pkgs/development/python-modules/aiosendspin/default.nix @@ -20,16 +20,22 @@ buildPythonPackage rec { pname = "aiosendspin"; - version = "1.2.0"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "Sendspin"; repo = "aiosendspin"; tag = version; - hash = "sha256-3vTEfXeFqouPswRKST/9U7yg9ah7J9m2KAMoxaBZNR0="; + hash = "sha256-9VhNtfXH2r/cGkscz51PIK2/66pPOGv0S0IpO0wFvO4="; }; + # https://github.com/Sendspin/aiosendspin/blob/1.2.0/pyproject.toml#L7 + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' + ''; + build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index 64f60ba0fcd0..9b7b0254bb5d 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -8,7 +8,6 @@ pytestCheckHook, pythonOlder, setuptools, - typing-extensions, # for passthru.tests django, @@ -32,8 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ atpublic attrs - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; nativeCheckInputs = [ pytest-mock diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index dbb725882385..83764d4dc228 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -1,14 +1,11 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, pdm-backend, jschon, pyvcd, jinja2, - importlib-resources, - importlib-metadata, git, # for tests @@ -43,9 +40,7 @@ buildPythonPackage rec { jschon jinja2 pyvcd - ] - ++ lib.optional (pythonOlder "3.9") importlib-resources - ++ lib.optional (pythonOlder "3.8") importlib-metadata; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index e7954e34f841..9f94e0787eec 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -4,10 +4,8 @@ fetchPypi, pytestCheckHook, writableTmpDirAsHomeHook, - pythonOlder, hatch-jupyter-builder, hatchling, - importlib-metadata, ipykernel, ipywidgets, psygnal, @@ -43,8 +41,7 @@ buildPythonPackage rec { ipywidgets psygnal typing-extensions - ] - ++ lib.optional (pythonOlder "3.8") importlib-metadata; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/automate-home/default.nix b/pkgs/development/python-modules/automate-home/default.nix index a6bb1e91233e..5c612efc7144 100644 --- a/pkgs/development/python-modules/automate-home/default.nix +++ b/pkgs/development/python-modules/automate-home/default.nix @@ -8,7 +8,6 @@ hiredis, pytestCheckHook, pythonAtLeast, - pythonOlder, pytz, pyyaml, setuptools, @@ -20,7 +19,7 @@ buildPythonPackage rec { pyproject = true; # Typing issue - disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 6c49c437bc97..30b7c1ed7694 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -1,10 +1,8 @@ { lib, buildPythonPackage, - pythonOlder, setuptools, fetchPypi, - typing-extensions, pytest7CheckHook, }: @@ -20,8 +18,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - nativeCheckInputs = [ pytest7CheckHook ]; disabledTests = [ diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 266299989746..118e249ce4da 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -7,13 +7,11 @@ django, fetchFromGitHub, httpx, - importlib-metadata, jsonpickle, pymysql, pytest-asyncio_0, pynamodb, pytestCheckHook, - pythonOlder, requests, setuptools, sqlalchemy, @@ -40,8 +38,7 @@ buildPythonPackage rec { jsonpickle requests wrapt - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ aiohttp diff --git a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix index e4b37c63bf29..360bd6c2bcc2 100644 --- a/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-appcontainers/default.nix @@ -2,12 +2,10 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, azure-common, azure-mgmt-core, isodate, setuptools, - typing-extensions, }: buildPythonPackage rec { @@ -28,8 +26,7 @@ buildPythonPackage rec { azure-common azure-mgmt-core isodate - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix index ff366fa7286c..1525ea2b7118 100644 --- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix @@ -5,8 +5,6 @@ azure-common, azure-mgmt-core, isodate, - pythonOlder, - typing-extensions, }: buildPythonPackage rec { @@ -24,8 +22,7 @@ buildPythonPackage rec { isodate azure-common azure-mgmt-core - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; pythonNamespaces = [ "azure.mgmt" ]; diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix index 1f717cc37fa3..1bf20bdd1a14 100644 --- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix @@ -5,8 +5,6 @@ buildPythonPackage, fetchPypi, isodate, - pythonOlder, - typing-extensions, msrest, }: @@ -25,8 +23,7 @@ buildPythonPackage rec { azure-common azure-mgmt-core msrest - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; pythonNamespaces = [ "azure.mgmt" ]; diff --git a/pkgs/development/python-modules/azure-mgmt-redis/default.nix b/pkgs/development/python-modules/azure-mgmt-redis/default.nix index aa02912d8a5a..9c0200e90eed 100644 --- a/pkgs/development/python-modules/azure-mgmt-redis/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-redis/default.nix @@ -5,8 +5,6 @@ buildPythonPackage, fetchPypi, isodate, - pythonOlder, - typing-extensions, }: buildPythonPackage rec { @@ -24,8 +22,7 @@ buildPythonPackage rec { isodate azure-common azure-mgmt-core - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix index b37871080857..57bc7b355bda 100644 --- a/pkgs/development/python-modules/azure-mgmt-reservations/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-reservations/default.nix @@ -6,8 +6,6 @@ msrest, azure-common, azure-mgmt-core, - typing-extensions, - pythonOlder, }: buildPythonPackage rec { @@ -27,8 +25,7 @@ buildPythonPackage rec { msrest azure-common azure-mgmt-core - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix index 2e07441c4d79..2f561f4ef4df 100644 --- a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix +++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools-scm, - importlib-metadata, }: buildPythonPackage rec { @@ -20,8 +18,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - # no tests doCheck = false; diff --git a/pkgs/development/python-modules/backports-strenum/default.nix b/pkgs/development/python-modules/backports-strenum/default.nix index e967ea74b973..8cbd84c01adc 100644 --- a/pkgs/development/python-modules/backports-strenum/default.nix +++ b/pkgs/development/python-modules/backports-strenum/default.nix @@ -5,7 +5,6 @@ poetry-core, pytestCheckHook, pythonAtLeast, - pythonOlder, }: buildPythonPackage rec { @@ -13,7 +12,7 @@ buildPythonPackage rec { version = "1.3.1"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.11"; + disabled = pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "clbarnes"; diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index d98d84f8124f..7dd016dad87a 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -3,10 +3,7 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - pythonOlder, setuptools, - typing-extensions, - zipp, }: buildPythonPackage rec { @@ -21,11 +18,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - typing-extensions - zipp - ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "catalogue" ]; diff --git a/pkgs/development/python-modules/cli-ui/default.nix b/pkgs/development/python-modules/cli-ui/default.nix index 5a0cafd7a7c9..1637d78749ee 100644 --- a/pkgs/development/python-modules/cli-ui/default.nix +++ b/pkgs/development/python-modules/cli-ui/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, pytestCheckHook, - pythonOlder, poetry-core, colorama, tabulate, @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "0.19.0"; pyproject = true; - disabled = pythonOlder "3.8.1"; - src = fetchFromGitHub { owner = "your-tools"; repo = "python-cli-ui"; diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index bbbd10a232f4..85713ee2cbd6 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -7,9 +7,7 @@ django, django-cache-url, fetchPypi, - importlib-metadata, mock, - pythonOlder, setuptools-scm, }: @@ -25,7 +23,7 @@ buildPythonPackage rec { buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ django ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + propagatedBuildInputs = [ django ]; nativeCheckInputs = [ mock diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 6a54a6e34180..a240dab9733c 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -5,7 +5,6 @@ fetchFromGitHub, fetchpatch, pythonAtLeast, - pythonOlder, replaceVars, # build @@ -48,7 +47,7 @@ buildPythonPackage rec { version = "4.2.27"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; + disabled = pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "django"; diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index fc701e9f8380..8cda01951587 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - importlib-metadata, matplotlib, numpy, pytestCheckHook, @@ -27,8 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib numpy - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/evaluate/default.nix b/pkgs/development/python-modules/evaluate/default.nix index 30ca31579b9f..a5892b4359ca 100644 --- a/pkgs/development/python-modules/evaluate/default.nix +++ b/pkgs/development/python-modules/evaluate/default.nix @@ -2,12 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, datasets, dill, fsspec, huggingface-hub, - importlib-metadata, multiprocess, numpy, packaging, @@ -44,8 +42,7 @@ buildPythonPackage rec { fsspec huggingface-hub packaging - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # most tests require internet access. doCheck = false; diff --git a/pkgs/development/python-modules/exdown/default.nix b/pkgs/development/python-modules/exdown/default.nix index 244266b05beb..0b1b0bf32747 100644 --- a/pkgs/development/python-modules/exdown/default.nix +++ b/pkgs/development/python-modules/exdown/default.nix @@ -3,9 +3,7 @@ buildPythonPackage, isPy27, fetchPypi, - pythonOlder, setuptools, - importlib-metadata, pytestCheckHook, }: @@ -24,8 +22,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "exdown" ]; diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index bd3db66e0bb9..83aa273913f4 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - importlib-metadata, importlib-resources, setuptools, pythonOlder, @@ -27,9 +26,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = - lib.optionals (pythonOlder "3.10") [ importlib-resources ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + dependencies = lib.optionals (pythonOlder "3.10") [ importlib-resources ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index 7aabc9f56107..16d62090e03d 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -3,8 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - fetchpatch2, - pythonOlder, uv-build, pytestCheckHook, go, @@ -16,8 +14,6 @@ buildPythonPackage rec { version = "0.6.2"; pyproject = true; - disabled = pythonOlder "3.8.1"; - src = fetchFromGitHub { owner = "Ch00k"; repo = "ffmpy"; diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 1d81c726ae23..10b3531a71d1 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -7,10 +7,8 @@ flask-wtf, markupsafe, mongoengine, - pythonOlder, setuptools, setuptools-scm, - typing-extensions, wtforms, }: @@ -38,8 +36,7 @@ buildPythonPackage rec { flask flask-wtf mongoengine - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; optional-dependencies = { wtf = [ diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix index 6c2cde3bc597..570fb4b5e8e7 100644 --- a/pkgs/development/python-modules/gentools/default.nix +++ b/pkgs/development/python-modules/gentools/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - importlib-metadata, poetry-core, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -22,8 +20,6 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "gentools" ]; diff --git a/pkgs/development/python-modules/gptcache/default.nix b/pkgs/development/python-modules/gptcache/default.nix index 7b79d8d9d261..2815ecef5615 100644 --- a/pkgs/development/python-modules/gptcache/default.nix +++ b/pkgs/development/python-modules/gptcache/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cachetools, numpy, - pythonOlder, redis, redis-om, requests, @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "0.1.44"; format = "setuptools"; - disabled = pythonOlder "3.8.1"; - src = fetchFromGitHub { owner = "zilliztech"; repo = "GPTCache"; diff --git a/pkgs/development/python-modules/graphql-relay/default.nix b/pkgs/development/python-modules/graphql-relay/default.nix index 8d414efe7fa3..a007d735ca66 100644 --- a/pkgs/development/python-modules/graphql-relay/default.nix +++ b/pkgs/development/python-modules/graphql-relay/default.nix @@ -3,14 +3,11 @@ buildPythonPackage, fetchPypi, - pythonOlder, - # build poetry-core, # runtime graphql-core, - typing-extensions, # tests pytest-asyncio, @@ -41,7 +38,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ graphql-core ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + propagatedBuildInputs = [ graphql-core ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index a1ced89cd953..719ce3bd7989 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -6,16 +6,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "growattserver"; - version = "1.7.1"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "indykoning"; repo = "PyPi_GrowattServer"; - tag = version; - hash = "sha256-rob2+uXuBD5Gf05rNFFEW210JxrTbWN7knk9Tnz7wOE="; + tag = finalAttrs.version; + hash = "sha256-2Jgz/wN0k6ni+4PbQwfDg3uMvYxv5N3BVgdARHqQ0Yc="; }; build-system = [ setuptools ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "Python package to retrieve information from Growatt units"; homepage = "https://github.com/indykoning/PyPi_GrowattServer"; - changelog = "https://github.com/indykoning/PyPi_GrowattServer/releases/tag/${src.tag}"; + changelog = "https://github.com/indykoning/PyPi_GrowattServer/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 28f5609fd34c..9e58d5641a00 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -2,7 +2,6 @@ lib, fetchPypi, buildPythonPackage, - pythonOlder, setuptools, numpy, hdf5, @@ -12,7 +11,6 @@ openssh, pytestCheckHook, pytest-mpi, - cached-property, }: assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi; @@ -71,8 +69,7 @@ buildPythonPackage rec { ++ lib.optionals mpiSupport [ mpi4py openssh - ] - ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix index 88ef35aee8be..b25ec89a35f9 100644 --- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix +++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix @@ -7,7 +7,6 @@ build, hatchling, tomli, - typing-extensions, }: buildPythonPackage rec { @@ -26,8 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hatchling ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ++ lib.optionals (pythonOlder "3.11") [ tomli ]; nativeCheckInputs = [ build diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 31c4f183d4fe..9a311c66a90c 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, setuptools-scm, - typing-extensions, toml, zipp, @@ -32,8 +30,7 @@ buildPythonPackage rec { dependencies = [ toml zipp - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; # Cyclic dependencies due to pyflakefs doCheck = false; diff --git a/pkgs/development/python-modules/ipykernel/tests.nix b/pkgs/development/python-modules/ipykernel/tests.nix index c1d7d1d7606b..3e4191104769 100644 --- a/pkgs/development/python-modules/ipykernel/tests.nix +++ b/pkgs/development/python-modules/ipykernel/tests.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - pythonOlder, flaky, ipykernel, ipyparallel, @@ -45,29 +44,15 @@ buildPythonPackage { # traitlets.config.configurable.MultipleInstanceError: An incompatible siblin... "test_install_kernelspec" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - [ - # see https://github.com/NixOS/nixpkgs/issues/76197 - "test_subprocess_print" - "test_subprocess_error" - "test_ipython_start_kernel_no_userns" - - # https://github.com/ipython/ipykernel/issues/506 - "test_unc_paths" - ] - ++ lib.optionals (pythonOlder "3.8") [ - # flaky test https://github.com/ipython/ipykernel/issues/485 - "test_shutdown" - - # test regression https://github.com/ipython/ipykernel/issues/486 - "test_sys_path_profile_dir" - "test_save_history" - "test_help_output" - "test_write_kernel_spec" - "test_ipython_start_kernel_userns" - "ZMQDisplayPublisherTests" - ] - ); + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # see https://github.com/NixOS/nixpkgs/issues/76197 + "test_subprocess_print" + "test_subprocess_error" + "test_ipython_start_kernel_no_userns" + + # https://github.com/ipython/ipykernel/issues/506 + "test_unc_paths" + ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index 0d113cfe39c6..6b04151f1eb1 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -7,7 +7,6 @@ ipython, scikit-build, cmake, - pythonOlder, pytestCheckHook, ubelt, }: @@ -17,7 +16,7 @@ buildPythonPackage rec { version = "5.0.0"; format = "setuptools"; - disabled = pythonOlder "3.8" || isPyPy; + disabled = isPyPy; src = fetchPypi { pname = "line_profiler"; diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index dc60c2846029..5ca97bffebe9 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -2,11 +2,9 @@ lib, buildPythonPackage, fetchPypi, - importlib-metadata, mypy-extensions, pytestCheckHook, pythonAtLeast, - pythonOlder, pytz, setuptools, typing-extensions, @@ -33,8 +31,7 @@ buildPythonPackage rec { setuptools mypy-extensions typing-extensions - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index b15cd1ab25e7..b00661f89d09 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, requests, - typing-extensions, }: buildPythonPackage rec { @@ -17,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-Y1gcYEyn6sAhSJwVqsygaklY63b2ZXTG+rBerGVN2Fc="; }; - propagatedBuildInputs = [ requests ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + propagatedBuildInputs = [ requests ]; # Tests require a running Mailman instance doCheck = false; diff --git a/pkgs/development/python-modules/markups/default.nix b/pkgs/development/python-modules/markups/default.nix index 5e4573cc152a..18766012b963 100644 --- a/pkgs/development/python-modules/markups/default.nix +++ b/pkgs/development/python-modules/markups/default.nix @@ -3,12 +3,10 @@ buildPythonPackage, docutils, fetchFromGitHub, - importlib-metadata, markdown, pygments, pytestCheckHook, python-markdown-math, - pythonOlder, pyyaml, setuptools, textile, @@ -35,8 +33,7 @@ buildPythonPackage rec { python-markdown-math pyyaml textile - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 8296ca891374..8817d524e4ee 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -10,22 +10,22 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "neo4j"; - version = "6.0.3"; + version = "6.1.0"; pyproject = true; src = fetchFromGitHub { owner = "neo4j"; repo = "neo4j-python-driver"; - tag = version; - hash = "sha256-KhPxwj5MmhNpd4d64dN0d1wOP6nAac/DsRQ8zoT03/A="; + tag = finalAttrs.version; + hash = "sha256-1Ef9SMJid0q+tI8hceriNu2vsLAyW4Jxt53ifcmi5VA="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "setuptools ==" "setuptools >=" \ - --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + --replace-fail 'dynamic = ["version"]' 'version = "${finalAttrs.version}"' ''; build-system = [ setuptools ]; @@ -49,8 +49,8 @@ buildPythonPackage rec { meta = { description = "Neo4j Bolt Driver for Python"; homepage = "https://github.com/neo4j/neo4j-python-driver"; - changelog = "https://github.com/neo4j/neo4j-python-driver/releases/tag/${src.tag}"; + changelog = "https://github.com/neo4j/neo4j-python-driver/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index ddd8221f021c..07d4d53b75a4 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -13,7 +13,6 @@ numpy, oldest-supported-numpy, python, - pythonOlder, setuptools-scm, stdenv, wheel, @@ -30,7 +29,7 @@ buildPythonPackage { inherit version; pyproject = true; - disabled = isPyPy || pythonOlder "3.8"; + disabled = isPyPy; src = fetchFromGitHub { owner = "Unidata"; diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index 9e0ff13a17f7..291bc5fd2ff8 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -10,7 +10,6 @@ fastapi, fetchFromGitHub, httpx, - importlib-metadata, mysqlclient, nest-asyncio, orjson, @@ -20,9 +19,7 @@ pymysql, pytest-asyncio, pytestCheckHook, - pythonOlder, sqlalchemy, - typing-extensions, }: buildPythonPackage rec { @@ -53,10 +50,6 @@ buildPythonPackage rec { pydantic sqlalchemy psycopg2 - ] - ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - importlib-metadata ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index 65f806d6778b..c289334dc2ca 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -4,9 +4,6 @@ fetchPypi, flit-core, tomli, - pythonOlder, - importlib-metadata, - zipp, pytestCheckHook, setuptools, testpath, @@ -28,10 +25,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ tomli - ] - ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - zipp ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index d56bffbf8239..61347f3b20ac 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchPypi, - importlib-metadata, passlib, python-dateutil, - pythonOlder, scramp, hatchling, versioningit, @@ -30,8 +28,7 @@ buildPythonPackage rec { passlib python-dateutil scramp - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # Tests require a running PostgreSQL instance doCheck = false; diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 3e9cd16b4b7c..313b63fcca83 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -3,9 +3,7 @@ appdirs, buildPythonPackage, fetchPypi, - importlib-metadata, packaging, - pythonOlder, requests, rich, setuptools, @@ -30,8 +28,7 @@ buildPythonPackage rec { requests rich setuptools - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # Tests require network access and pythonImportsCheck requires configuration file doCheck = false; diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 834558d81c44..f32e33bbc61d 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pytestCheckHook, pythonAtLeast, - pythonOlder, setuptools, }: @@ -13,7 +12,7 @@ buildPythonPackage rec { version = "0.7.19"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; + disabled = pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "ponyorm"; diff --git a/pkgs/development/python-modules/py-opensonic/default.nix b/pkgs/development/python-modules/py-opensonic/default.nix index 63688ca8b028..5a3f34d650dc 100644 --- a/pkgs/development/python-modules/py-opensonic/default.nix +++ b/pkgs/development/python-modules/py-opensonic/default.nix @@ -3,25 +3,27 @@ buildPythonPackage, fetchFromGitHub, setuptools, + aiohttp, mashumaro, requests, }: buildPythonPackage rec { pname = "py-opensonic"; - version = "7.0.4"; + version = "8.1.1"; pyproject = true; src = fetchFromGitHub { owner = "khers"; repo = "py-opensonic"; tag = "v${version}"; - hash = "sha256-5wsisIfYW+0uh0khUzt9wKFxBf/ZXVsKpNF/Dcrj2wI="; + hash = "sha256-/P/7ytA0YHuJZEq7KQosPBQM2vo6VAss1G8pTIEswJA="; }; build-system = [ setuptools ]; dependencies = [ + aiohttp mashumaro requests ]; diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index 946a5f7892e1..f27b9e8d504a 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -3,11 +3,9 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - importlib-metadata, numpy, pybind11, pytestCheckHook, - pythonOlder, setuptools, }: @@ -35,7 +33,7 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; - dependencies = [ numpy ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index 9a1e7bfd0e20..70073d214f76 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,12 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, - importlib-metadata, isort, poetry-core, pytest, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -26,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - propagatedBuildInputs = [ isort ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + propagatedBuildInputs = [ isort ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 12b8e76d37a9..0deb0563e8b5 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -11,14 +11,12 @@ defusedxml, fetchPypi, fetchpatch, - importlib-metadata, micloud, netifaces, poetry-core, pytest-asyncio, pytest-mock, pytestCheckHook, - pythonOlder, pytz, pyyaml, tqdm, @@ -67,8 +65,7 @@ buildPythonPackage rec { pyyaml tqdm zeroconf - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/python-rabbitair/default.nix b/pkgs/development/python-modules/python-rabbitair/default.nix index 29738685812b..bc6702cae441 100644 --- a/pkgs/development/python-modules/python-rabbitair/default.nix +++ b/pkgs/development/python-modules/python-rabbitair/default.nix @@ -5,9 +5,7 @@ fetchFromGitHub, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, - typing-extensions, zeroconf, }: @@ -28,8 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography zeroconf - ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index 615b2fc3379b..9fcec324a51c 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -1,14 +1,12 @@ { lib, buildPythonPackage, - cached-property, click, fetchFromGitHub, packaging, pytest-cov-stub, pytest-timeout, pytestCheckHook, - pythonOlder, setuptools, }: @@ -26,7 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; + propagatedBuildInputs = [ packaging ]; optional-dependencies = { cli = [ click ]; diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index d820df9f40e8..2de315b4662f 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -4,7 +4,6 @@ fetchPypi, astropy, pillow, - pythonOlder, pytestCheckHook, pytest-astropy, requests, @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "1.8"; pyproject = true; - disabled = pythonOlder "3.8"; # according to setup.cfg - src = fetchPypi { inherit pname version; hash = "sha256-ZvSIn9jjnd30b+SYYV02FW1JT2or7FOIa68cLFQyKGE="; diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index d07931c724b0..5a6cef69983b 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -5,7 +5,6 @@ faker, fetchPypi, httpretty, - importlib-metadata, inflection, jsondate, mock, @@ -15,7 +14,6 @@ parameterized, pytestCheckHook, python-dateutil, - pythonOlder, requests, six, }: @@ -41,8 +39,7 @@ buildPythonPackage rec { python-dateutil six more-itertools - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; nativeCheckInputs = [ factory-boy diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index efcbb87009e8..a7f31be0f5f3 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -3,12 +3,9 @@ buildPythonPackage, canonicaljson, fetchPypi, - importlib-metadata, pynacl, pytestCheckHook, - pythonOlder, setuptools-scm, - typing-extensions, unpaddedbase64, }: @@ -28,10 +25,6 @@ buildPythonPackage rec { canonicaljson unpaddedbase64 pynacl - ] - ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - typing-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index a675939ff93b..ba52464aee85 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - importlib-metadata, sphinx, pyenchant, setuptools, @@ -32,8 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sphinx pyenchant - ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # No tests included doCheck = false; diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix index ba9179ab18d3..8518632fcae6 100644 --- a/pkgs/development/python-modules/statmake/default.nix +++ b/pkgs/development/python-modules/statmake/default.nix @@ -7,7 +7,6 @@ fetchFromGitHub, fonttools, fs, - importlib-metadata, poetry-core, pytestCheckHook, pythonOlder, @@ -43,8 +42,7 @@ buildPythonPackage rec { # required by fonttools[ufo] fs ] - ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index fcb33980d7de..a59295d5d6fb 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -25,19 +25,17 @@ watchdog, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "streamlit"; - version = "1.52.2"; + version = "1.53.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-ZKTdqLxc3Te/1JDpO7U9o1qu+Ub8/Cg6eYDazfFlEIs="; + inherit (finalAttrs) pname version; + hash = "sha256-ARQRbTRYny5lK/Ssc1o6ymmAfmWfkvmcmOe2INAAg48="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; pythonRelaxDeps = [ "packaging" ]; @@ -74,7 +72,7 @@ buildPythonPackage rec { meta = { homepage = "https://streamlit.io/"; - changelog = "https://github.com/streamlit/streamlit/releases/tag/${version}"; + changelog = "https://github.com/streamlit/streamlit/releases/tag/${finalAttrs.version}"; description = "Fastest way to build custom ML tools"; mainProgram = "streamlit"; maintainers = with lib.maintainers; [ @@ -83,4 +81,4 @@ buildPythonPackage rec { ]; license = lib.licenses.asl20; }; -} +}) diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index cdb909b505a8..ef626df9bd36 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -4,8 +4,6 @@ buildPythonPackage, cfn-flip, fetchFromGitHub, - pythonOlder, - typing-extensions, unittestCheckHook, }: @@ -21,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-s7eb8W/QjD+lNmq3bPhCP3tH8VV/xNf3cE2dGzWAgFk="; }; - propagatedBuildInputs = [ cfn-flip ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + propagatedBuildInputs = [ cfn-flip ]; nativeCheckInputs = [ awacs diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index ce006b56011c..3d641de72490 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -26,7 +26,6 @@ in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; version = "0.15.3"; - disabled = python.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mautrix"; |