diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index ce7ac04dd9b1..bafa9fe12b91 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -50,7 +50,6 @@ sets are * `pkgs.python27Packages` * `pkgs.python3Packages` -* `pkgs.python310Packages` * `pkgs.python311Packages` * `pkgs.python312Packages` * `pkgs.python313Packages` @@ -897,7 +896,7 @@ on NixOS. # ... environment.systemPackages = with pkgs; [ - (python310.withPackages ( + (python314.withPackages ( ps: with ps; [ numpy toolz @@ -1683,7 +1682,7 @@ with import { }; }); }; in - pkgs.python310.override { inherit packageOverrides; }; + pkgs.python313.override { inherit packageOverrides; }; in python.withPackages (ps: [ ps.pandas ]) @@ -1707,7 +1706,7 @@ with import { }; let packageOverrides = self: super: { scipy = super.scipy_0_17; }; in - (pkgs.python310.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ]) + (pkgs.python313.override { inherit packageOverrides; }).withPackages (ps: [ ps.blaze ]) ).env ``` @@ -1723,13 +1722,13 @@ let newpkgs = import pkgs.path { overlays = [ (self: super: { - python310 = + python313 = let packageOverrides = python-self: python-super: { numpy = python-super.numpy_1_18; }; in - super.python310.override { inherit packageOverrides; }; + super.python313.override { inherit packageOverrides; }; }) ]; }; diff --git a/nixos/modules/services/security/pass-secret-service.nix b/nixos/modules/services/security/pass-secret-service.nix index 7dc21b44a6f9..0a74b2dbf5d3 100644 --- a/nixos/modules/services/security/pass-secret-service.nix +++ b/nixos/modules/services/security/pass-secret-service.nix @@ -12,7 +12,7 @@ in enable = lib.mkEnableOption "pass secret service"; package = lib.mkPackageOption pkgs "pass-secret-service" { - example = "pass-secret-service.override { python3 = pkgs.python310 }"; + example = "pass-secret-service.override { python3 = pkgs.python315 }"; }; }; diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix index 7ad563339584..0024092cfcd5 100644 --- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix @@ -8,30 +8,26 @@ let version = "3.2.2"; - dependencies = - with python3.pkgs; - [ - pyembroidery - inkex - wxpython - networkx - platformdirs - shapely - lxml - appdirs - numpy - jinja2 - requests - colormath2 - flask - fonttools - trimesh - scipy - diskcache - flask-cors - ] - # Inkstitch uses the builtin tomllib instead when Python >=3.11 - ++ lib.optional (pythonOlder "3.11") tomli; + dependencies = with python3.pkgs; [ + pyembroidery + inkex + wxpython + networkx + platformdirs + shapely + lxml + appdirs + numpy + jinja2 + requests + colormath2 + flask + fonttools + trimesh + scipy + diskcache + flask-cors + ]; pyEnv = python3.withPackages (_: dependencies); in python3.pkgs.buildPythonApplication { diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index f755ad43abe9..24f00b3a4bce 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -175,8 +175,7 @@ stdenv.mkDerivation rec { homepage = "http://caffe.berkeleyvision.org/"; maintainers = [ ]; broken = - (pythonSupport && (python.isPy310)) - || !(leveldbSupport -> (leveldb != null && snappy != null)) + !(leveldbSupport -> (leveldb != null && snappy != null)) || !(pythonSupport -> (python != null && numpy != null)); license = lib.licenses.bsd2; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 91a0459854bf..1d6eb5b49f79 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -52,7 +52,7 @@ obs-markdown = callPackage ./obs-markdown.nix { }; - obs-media-controls = qt6Packages.callPackage ./obs-media-controls.nix { }; + obs-media-controls = qt6Packages.callPackage ./obs-media-controls { }; obs-move-transition = callPackage ./obs-move-transition.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix similarity index 83% rename from pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix rename to pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix index c4d970a15d92..61a1936ae9b0 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/default.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-CElK9e+wpnMiup6DwdQpQfVMm6atXvz+JYHsGnv3lFo="; }; + patches = [ + # Fix cmake build with qt 6.10 + # Submitted upstream: https://github.com/exeldro/obs-media-controls/pull/28 + ./fix-cmake.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio diff --git a/pkgs/applications/video/obs-studio/plugins/obs-media-controls/fix-cmake.patch b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/fix-cmake.patch new file mode 100644 index 000000000000..19f06388ca20 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-media-controls/fix-cmake.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 95172a0..3be0ec3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,7 +25,7 @@ else() + target_link_libraries(${PROJECT_NAME} PRIVATE OBS::frontend-api) + endif() + +-find_package(Qt6 COMPONENTS Widgets Core) ++find_package(Qt6 REQUIRED COMPONENTS Widgets Core) + if(BUILD_OUT_OF_TREE) + if(OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) + find_package(Qt6 REQUIRED Gui) +@@ -33,8 +33,9 @@ if(BUILD_OUT_OF_TREE) + endif() + target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets) + +-if((OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) AND Qt_VERSION VERSION_LESS "6.9.0") +- target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate) ++if((OS_LINUX OR OS_FREEBSD OR OS_OPENBSD) AND Qt6_VERSION VERSION_LESS "6.9.0") ++ find_package(Qt6 REQUIRED COMPONENTS GuiPrivate) ++ target_link_libraries(${PROJECT_NAME} PRIVATE Qt::GuiPrivate) + endif() + + target_compile_options( diff --git a/pkgs/build-support/node/prefetch-npm-deps/src/main.rs b/pkgs/build-support/node/prefetch-npm-deps/src/main.rs index 5ab0413cdcad..2882aee9ec20 100644 --- a/pkgs/build-support/node/prefetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/prefetch-npm-deps/src/main.rs @@ -67,6 +67,20 @@ const ALLOWED_VERSION_FIELDS: &[&str] = &[ "scripts", ]; +/// Allowed fields in `dist` sub-objects. +/// +/// Only fields that npm reads during `npm install` are included. +/// Excluded volatile fields: +/// - `signatures`: changes when npm rotates registry signing keys +/// - `npm-signature`: legacy signature format, also mutable +/// - `attestations`: provenance attestations, can be added/updated post-publish +/// - `fileCount`, `unpackedSize`: informational only, not used during install +const ALLOWED_DIST_FIELDS: &[&str] = &[ + "tarball", // URL to download the package tarball + "integrity", // SRI hash for verification (e.g., sha512-...) + "shasum", // SHA-1 fallback hash for older lockfiles +]; + fn normalize_packument( package_name: &str, data: &[u8], @@ -91,6 +105,12 @@ fn normalize_packument( for version_val in versions.values_mut() { if let Some(version_obj) = version_val.as_object_mut() { version_obj.retain(|key, _| ALLOWED_VERSION_FIELDS.contains(&key.as_str())); + + // Normalize the dist sub-object to strip volatile fields + // (signatures, npm-signature, attestations, fileCount, unpackedSize) + if let Some(Value::Object(dist_obj)) = version_obj.get_mut("dist") { + dist_obj.retain(|key, _| ALLOWED_DIST_FIELDS.contains(&key.as_str())); + } } } } diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix index 3c3ba6659938..2f8862c465d9 100644 --- a/pkgs/by-name/au/autosuspend/package.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -10,8 +10,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { version = "9.0.1"; pyproject = true; - disabled = python3.pythonOlder "3.11"; - src = fetchFromGitHub { owner = "languitar"; repo = "autosuspend"; diff --git a/pkgs/by-name/ch/cheat/package.nix b/pkgs/by-name/ch/cheat/package.nix index 2405425ed33d..7d5ace6aa359 100644 --- a/pkgs/by-name/ch/cheat/package.nix +++ b/pkgs/by-name/ch/cheat/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "cheat"; - version = "4.4.2"; + version = "4.5.0"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; tag = finalAttrs.version; - sha256 = "sha256-GUU6VWfTmNS6ny12HnMr3uQmS7HI86Oupcmqx0MVAvE="; + sha256 = "sha256-RDfOdyQL9QICXZmgYCmz532iTuPdCW8GixajvEXmaUQ="; }; subPackages = [ "cmd/cheat" ]; diff --git a/pkgs/by-name/cr/cruft/package.nix b/pkgs/by-name/cr/cruft/package.nix index 103bfa81345b..cfff76b9e84c 100644 --- a/pkgs/by-name/cr/cruft/package.nix +++ b/pkgs/by-name/cr/cruft/package.nix @@ -28,15 +28,12 @@ python3Packages.buildPythonApplication (finalAttrs: { pytest7CheckHook ]; - dependencies = - with python3Packages; - [ - click - cookiecutter - gitpython - typer - ] - ++ lib.optional (pythonOlder "3.11") python3Packages.toml; + dependencies = with python3Packages; [ + click + cookiecutter + gitpython + typer + ]; pythonImportsCheck = "cruft"; diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix index 46356e6f5d17..6ee478bc1f33 100644 --- a/pkgs/by-name/cu/cursor-cli/package.nix +++ b/pkgs/by-name/cu/cursor-cli/package.nix @@ -9,26 +9,26 @@ let inherit (stdenv) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/linux/x64/agent-cli-package.tar.gz"; - hash = "sha256-Nj6q11iaa++b5stsEu1eBRAYUFRPft84XcHuTCZL5D0="; + url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/linux/x64/agent-cli-package.tar.gz"; + hash = "sha256-mJPEmBNbmsTfgt0b7abrSHJLI52WfLny5Es4uGyDwew="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/linux/arm64/agent-cli-package.tar.gz"; - hash = "sha256-6oajVZw599vzy2c1olEzoIlqbmfZRK1atb85fiR72y0="; + url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/linux/arm64/agent-cli-package.tar.gz"; + hash = "sha256-ncXdGxOYlwud4Z3w5DMOmXUZ2hEcI/q4stm0yACuvy4="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/darwin/x64/agent-cli-package.tar.gz"; - hash = "sha256-G23LC7Sl1GjfaECndSuyCxHK4drkJKG3B1U2k5SAHJA="; + url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/darwin/x64/agent-cli-package.tar.gz"; + hash = "sha256-KcmGT6WCEc97qKqtZknFsUo9RX2SOuyjv6Jyfnrv3Os="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.01.28-fd13201/darwin/arm64/agent-cli-package.tar.gz"; - hash = "sha256-R5kEfd84IaUXuN+PIzpGD1NGPzD6xxM9NAXAAt6d0N8="; + url = "https://downloads.cursor.com/lab/2026.02.13-41ac335/darwin/arm64/agent-cli-package.tar.gz"; + hash = "sha256-ib0ZsXVc2YqAkPuMie4kwWIFrmNcD+1vX3tcvyA/PJw="; }; }; in stdenv.mkDerivation { pname = "cursor-cli"; - version = "0-unstable-2026-01-28"; + version = "0-unstable-2026-02-13"; src = sources.${hostPlatform.system}; diff --git a/pkgs/by-name/ex/exo/package.nix b/pkgs/by-name/ex/exo/package.nix index 7a63cd3e0d92..ebb8d6cd55e1 100644 --- a/pkgs/by-name/ex/exo/package.nix +++ b/pkgs/by-name/ex/exo/package.nix @@ -75,7 +75,7 @@ let sourceRoot ; fetcherVersion = 2; - hash = "sha256-3ZgE1ysb1OeB4BNszvlrnYcc7gOo7coPfOEQmMHC6E0="; + hash = "sha256-ok1Yl8CIPwViioH5HOM4VWilRU3HsSa8IAsBFl/QgG0="; }; }); diff --git a/pkgs/by-name/fu/furtherance/package.nix b/pkgs/by-name/fu/furtherance/package.nix index fc370f63110a..88d16f3e5f46 100644 --- a/pkgs/by-name/fu/furtherance/package.nix +++ b/pkgs/by-name/fu/furtherance/package.nix @@ -16,16 +16,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "furtherance"; - version = "26.1.1"; + version = "26.7.0"; src = fetchFromGitHub { owner = "unobserved-io"; repo = "Furtherance"; rev = finalAttrs.version; - hash = "sha256-VG1Ghhi74tkPU9bgauV98Gp5kVoZJ1cJUqWLWnrUAOU="; + hash = "sha256-UMkFEbLdwZsSJviO29FNmLYLL5/HofhriMptpjSAYuY="; }; - cargoHash = "sha256-6S0L8FHI5eCTzhxlew35pK7TewMplKKJDaqJdtoYRnM="; + cargoHash = "sha256-fdslQutVEGq1EG+Q8QAYKf9XfoostvHKWZrr4YwEowQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gc/gcovr/package.nix b/pkgs/by-name/gc/gcovr/package.nix index e2e0948687fa..13c1a542e91c 100644 --- a/pkgs/by-name/gc/gcovr/package.nix +++ b/pkgs/by-name/gc/gcovr/package.nix @@ -35,17 +35,12 @@ python3Packages.buildPythonPackage (finalAttrs: { --replace-fail "hatch-vcs==0.4.0" "hatch-vcs>=0.4.0" ''; - dependencies = - with python3Packages; - ( - [ - colorlog - jinja2 - lxml - pygments - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ] - ); + dependencies = with python3Packages; [ + colorlog + jinja2 + lxml + pygments + ]; pythonImportsCheck = [ "gcovr" diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index d3f76f1a6042..01b3c949931a 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "halo"; - version = "2.22.13"; + version = "2.22.14"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${finalAttrs.version}/halo-${finalAttrs.version}.jar"; - hash = "sha256-SYpO+A7si9k/zTyNXpZpxuHbbOv3JofBQv0fISfDRaQ="; + hash = "sha256-8AAiR8EVG/3mHpRr85O6zRcrxu5/P+VK2+QaV9ARAJ8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/lg/lgpio/package.nix b/pkgs/by-name/lg/lgpio/package.nix index 21051bcfa660..c3fb1caf639d 100644 --- a/pkgs/by-name/lg/lgpio/package.nix +++ b/pkgs/by-name/lg/lgpio/package.nix @@ -36,6 +36,8 @@ mkDerivation rec { swig ]; + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + preConfigure = lib.optionalString (pyProject != "") '' cd ${pyProject} ''; diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix index 98b0f927ad37..8672419322f5 100644 --- a/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/pkgs/by-name/ma/maven/build-maven-package.nix @@ -52,7 +52,7 @@ let ] ++ args.nativeBuildInputs or [ ]; - JAVA_HOME = mvnJdk; + env.JAVA_HOME = mvnJdk; impureEnvVars = lib.fetchers.proxyImpureEnvVars; @@ -131,7 +131,7 @@ stdenv.mkDerivation ( maven ]; - JAVA_HOME = mvnJdk; + env.JAVA_HOME = mvnJdk; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index 4805481ad3db..80aa04bcece1 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "numbat"; - version = "1.20.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "numbat"; tag = "v${finalAttrs.version}"; - hash = "sha256-Wh7HmE9UPu7+/aguaqON2/pmEHulYw69O0YjoKeDuRg="; + hash = "sha256-xezYRtIzP3MHme/7DwaM0hMgGTcio6iABuNREOOh6HU="; }; - cargoHash = "sha256-F8fjrkQVWmDKGXNYG1e1Fvu9z1EgHC/2zuqN3O/2exE="; + cargoHash = "sha256-oNGq00Znh5WLc+y2NEWZL7Bl17gIaSY7PXYLel9Ucjg="; env.NUMBAT_SYSTEM_MODULE_PATH = "${placeholder "out"}/share/numbat/modules"; diff --git a/pkgs/by-name/nv/nvme-cli/package.nix b/pkgs/by-name/nv/nvme-cli/package.nix index 4c6860c3d15b..f4660672415e 100644 --- a/pkgs/by-name/nv/nvme-cli/package.nix +++ b/pkgs/by-name/nv/nvme-cli/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nvme-cli"; - version = "2.15"; + version = "2.16"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-zXzNjEpxioqYoSHDzimCnP/tKbi0H+GTH4xZ0g1+XnU="; + hash = "sha256-gW95iJF9RnPC1mcoLjS3r+4tZhX+TP4BSOMU0uB256A="; }; mesonFlags = [ diff --git a/pkgs/by-name/or/orthanc/package.nix b/pkgs/by-name/or/orthanc/package.nix index ca8e98654831..3cc9566507eb 100644 --- a/pkgs/by-name/or/orthanc/package.nix +++ b/pkgs/by-name/or/orthanc/package.nix @@ -28,12 +28,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "orthanc"; - version = "1.12.9"; + version = "1.12.10"; src = fetchhg { url = "https://orthanc.uclouvain.be/hg/orthanc/"; rev = "Orthanc-${finalAttrs.version}"; - hash = "sha256-IBULO03og+aXmpYAXZdsesTFkc7HkeXol+A7yzDzcfQ="; + hash = "sha256-+y+99NKyAWoQmvgCfubNuGiJ68uUwUvE2O64gZ/3uNA="; }; outputs = [ diff --git a/pkgs/by-name/pg/pgsrip/package.nix b/pkgs/by-name/pg/pgsrip/package.nix index b5dbfa9743ce..44080d62d5e4 100644 --- a/pkgs/by-name/pg/pgsrip/package.nix +++ b/pkgs/by-name/pg/pgsrip/package.nix @@ -9,8 +9,6 @@ python3Packages.buildPythonApplication (finalAttrs: { version = "0.1.12"; pyproject = true; - disabled = python3Packages.pythonOlder "3.11"; - src = fetchFromGitHub { owner = "ratoaq2"; repo = "pgsrip"; diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index a08c4c4dd40f..950ffddc7302 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, findpython, installShellFiles, @@ -26,7 +25,6 @@ trove-classifiers, virtualenv, xattr, - tomli, deepdiff, pytestCheckHook, httpretty, @@ -80,9 +78,6 @@ buildPythonPackage rec { ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ xattr ] - ++ lib.optionals (pythonOlder "3.11") [ - tomli - ] ++ cachecontrol.optional-dependencies.filecache ++ pbs-installer.optional-dependencies.download ++ pbs-installer.optional-dependencies.install; diff --git a/pkgs/by-name/pr/prefect/package.nix b/pkgs/by-name/pr/prefect/package.nix index 7c9776d635e6..c23de54e11c9 100644 --- a/pkgs/by-name/pr/prefect/package.nix +++ b/pkgs/by-name/pr/prefect/package.nix @@ -94,8 +94,7 @@ python3Packages.buildPythonApplication rec { semver ] ++ sqlalchemy.optional-dependencies.asyncio - ++ httpx.optional-dependencies.http2 - ++ python-socks.optional-dependencies.asyncio; + ++ httpx.optional-dependencies.http2; optional-dependencies = with python3Packages; { aws = [ diff --git a/pkgs/by-name/py/pyrosimple/package.nix b/pkgs/by-name/py/pyrosimple/package.nix index bbf255fa50aa..f206e410b6e0 100644 --- a/pkgs/by-name/py/pyrosimple/package.nix +++ b/pkgs/by-name/py/pyrosimple/package.nix @@ -46,9 +46,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { python-box tomli-w ] - ++ lib.optionals (pythonOlder "3.11") [ - tomli - ] ++ lib.optional withInotify inotify; nativeCheckInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/sc/scriv/package.nix b/pkgs/by-name/sc/scriv/package.nix index e7c40364a384..f04aa710ae47 100644 --- a/pkgs/by-name/sc/scriv/package.nix +++ b/pkgs/by-name/sc/scriv/package.nix @@ -29,19 +29,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { build-system = with python3.pkgs; [ setuptools ]; - dependencies = - with python3.pkgs; - [ - attrs - click - click-log - jinja2 - markdown-it-py - requests - ] - ++ lib.optionals (python3.pythonOlder "3.11") [ - tomli - ]; + dependencies = with python3.pkgs; [ + attrs + click + click-log + jinja2 + markdown-it-py + requests + ]; nativeCheckInputs = with python3.pkgs; [ pytestCheckHook diff --git a/pkgs/by-name/sn/snakefmt/package.nix b/pkgs/by-name/sn/snakefmt/package.nix index 5bc3805f96fc..a27061d35b07 100644 --- a/pkgs/by-name/sn/snakefmt/package.nix +++ b/pkgs/by-name/sn/snakefmt/package.nix @@ -11,8 +11,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { version = "0.11.4"; pyproject = true; - disabled = python3.pythonOlder "3.11"; - src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-LfJVYdViI88L/DtfUD1znBHUiLQb7MKhyJ2jhFCW4+Y="; diff --git a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix index fda6fb875e66..688412aa6593 100644 --- a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix +++ b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix @@ -24,25 +24,22 @@ python3Packages.buildPythonApplication (finalAttrs: { hatchling ]; - dependencies = - with python3Packages; - [ - click - mysql-connector - pytimeparse2 - pymysql - pymysqlsa - simplejson - sqlalchemy - sqlalchemy-utils - tqdm - tabulate - unidecode - packaging - mysql80 - python-dateutil - ] - ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + dependencies = with python3Packages; [ + click + mysql-connector + pytimeparse2 + pymysql + pymysqlsa + simplejson + sqlalchemy + sqlalchemy-utils + tqdm + tabulate + unidecode + packaging + mysql80 + python-dateutil + ]; pythonRelaxDeps = [ "mysql-connector-python" diff --git a/pkgs/by-name/ui/uiua/stable.nix b/pkgs/by-name/ui/uiua/stable.nix index 4d20fce4691d..a3968b29eeda 100644 --- a/pkgs/by-name/ui/uiua/stable.nix +++ b/pkgs/by-name/ui/uiua/stable.nix @@ -1,7 +1,7 @@ rec { - version = "0.18.0"; + version = "0.18.1"; tag = version; - hash = "sha256-049fEvLiRK2QfX6W0zCuL2QNACkBn0HmuGYjUGAWR1M="; - cargoHash = "sha256-rGWMhghlYaUupn2vqDxBEezgENH4GCXlf2RU3iRrmxo="; + hash = "sha256-HB6YjWi4DEbLTwMhqtcF0IufK8YEmE4w/7n/nsL8VEw="; + cargoHash = "sha256-B2eDBf5ycFpXBk9XIzkltdr6eDs/CHHufHtjoOAvg2E="; updateScript = ./update-stable.sh; } diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix index ce655cd5b93f..2d471223ea82 100644 --- a/pkgs/by-name/ui/uiua/unstable.nix +++ b/pkgs/by-name/ui/uiua/unstable.nix @@ -1,7 +1,7 @@ rec { - version = "0.18.0"; + version = "0.18.1"; tag = version; - hash = "sha256-049fEvLiRK2QfX6W0zCuL2QNACkBn0HmuGYjUGAWR1M="; - cargoHash = "sha256-rGWMhghlYaUupn2vqDxBEezgENH4GCXlf2RU3iRrmxo="; + hash = "sha256-HB6YjWi4DEbLTwMhqtcF0IufK8YEmE4w/7n/nsL8VEw="; + cargoHash = "sha256-B2eDBf5ycFpXBk9XIzkltdr6eDs/CHHufHtjoOAvg2E="; updateScript = ./update-unstable.sh; } diff --git a/pkgs/by-name/ya/yarn-berry/fetcher/default.nix b/pkgs/by-name/ya/yarn-berry/fetcher/default.nix index a9e3b920fe04..5392c6450ccd 100644 --- a/pkgs/by-name/ya/yarn-berry/fetcher/default.nix +++ b/pkgs/by-name/ya/yarn-berry/fetcher/default.nix @@ -8,6 +8,7 @@ zlib-ng, makeScopeWithSplicing', generateSplicesForMkScope, + fetchpatch, }: let @@ -46,9 +47,22 @@ let libzip = (libzip.override { # Known good version: 2.2.4 - zlib = zlib-ng.override { - withZlibCompat = true; - }; + zlib = + (zlib-ng.overrideAttrs (old: { + patches = old.patches or [ ] ++ [ + # Yarn hashes the output of libzip(untar(tarball)), so the output of libzip + # needs to be an exact match across versions, and this commit changes the + # exact output. This is ridiculous, but such is life. + (fetchpatch { + url = "https://github.com/zlib-ng/zlib-ng/commit/be819413be8a284b1827437006c0859644d0c367.patch"; + revert = true; + hash = "sha256-rwRcNKpA2dMWkC6WRATDOCYCDDqqPvFJkQ6DLDohQd8="; + }) + ]; + })).override + { + withZlibCompat = true; + }; }).overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix index eb732bbfbb33..c0a8197983e9 100644 --- a/pkgs/by-name/zi/zipline/package.nix +++ b/pkgs/by-name/zi/zipline/package.nix @@ -36,13 +36,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "zipline"; - version = "4.4.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = "diced"; repo = "zipline"; tag = "v${finalAttrs.version}"; - hash = "sha256-9+r3padIhpmLNfiL68eut7e+VemhsqhvRcJhyOdA7+k="; + hash = "sha256-RFajEXewnOCkp4xz/fhugVEt+BPNrrQY4Oeqt6Gg6p0="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git_head diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 3547aee2af9d..fdb5dd923cde 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -26,7 +26,7 @@ let "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw="; "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0="; - "22.1.0-rc2".officialRelease.sha256 = "sha256-j0KSuTANrwLh/siEcztSqCYQQDYHmdBCgVCsPsDCQ+I="; + "22.1.0-rc3".officialRelease.sha256 = "sha256-vGG7lDdDFW427lS384Bl7Pt9QFgK1XVxLmtm878xmxU="; "23.0.0-git".gitRelease = { rev = "dc152f0d2d085dcfb7542d0e71e19ebfa1aa3794"; rev-version = "23.0.0-unstable-2026-02-01"; diff --git a/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch deleted file mode 100644 index e65883ab895a..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 084c6dd6352077e64f10cf7aa168f95d800f3819 Mon Sep 17 00:00:00 2001 -From: Jonathan Ringer -Date: Mon, 9 Nov 2020 10:24:35 -0800 -Subject: [PATCH] CPython: Don't use ldconfig - ---- - Lib/ctypes/util.py | 77 ++-------------------------------------------- - 1 file changed, 2 insertions(+), 75 deletions(-) - -diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 0c2510e..7fb98af 100644 ---- a/Lib/ctypes/util.py -+++ b/Lib/ctypes/util.py -@@ -268,34 +222,7 @@ elif os.name == "posix": - else: - - def _findSoname_ldconfig(name): -- import struct -- if struct.calcsize('l') == 4: -- machine = os.uname().machine + '-32' -- else: -- machine = os.uname().machine + '-64' -- mach_map = { -- 'x86_64-64': 'libc6,x86-64', -- 'ppc64-64': 'libc6,64bit', -- 'sparc64-64': 'libc6,64bit', -- 's390x-64': 'libc6,64bit', -- 'ia64-64': 'libc6,IA-64', -- } -- abi_type = mach_map.get(machine, 'libc6') -- -- # XXX assuming GLIBC's ldconfig (with option -p) -- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' -- regex = os.fsencode(regex % (re.escape(name), abi_type)) -- try: -- with subprocess.Popen(['/sbin/ldconfig', '-p'], -- stdin=subprocess.DEVNULL, -- stderr=subprocess.DEVNULL, -- stdout=subprocess.PIPE, -- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: -- res = re.search(regex, p.stdout.read()) -- if res: -- return os.fsdecode(res.group(1)) -- except OSError: -- pass -+ return None - - def _findLib_ld(name): - # See issue #9998 for why this is needed --- -2.28.0 - diff --git a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch b/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch deleted file mode 100644 index 243313f76548..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.7/python-3.x-distutils-C++.patch +++ /dev/null @@ -1,248 +0,0 @@ ---- a/Lib/_osx_support.py -+++ b/Lib/_osx_support.py -@@ -14,13 +14,13 @@ __all__ = [ - # configuration variables that may contain universal build flags, - # like "-arch" or "-isdkroot", that may need customization for - # the user environment --_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', -- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', -- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', -- 'PY_CORE_CFLAGS', 'PY_CORE_LDFLAGS') -+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', -+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', -+ 'PY_CPPFLAGS', 'PY_CORE_LDFLAGS', 'PY_CORE_CFLAGS') - - # configuration variables that may contain compiler calls --_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') -+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') - - # prefix added to original configuration variable names - _INITPRE = '_OSX_SUPPORT_INITIAL_' ---- a/Lib/distutils/cygwinccompiler.py -+++ b/Lib/distutils/cygwinccompiler.py -@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler): - # dllwrap 2.10.90 is buggy - if self.ld_version >= "2.10.90": - self.linker_dll = "gcc" -+ self.linker_dll_cxx = "g++" - else: - self.linker_dll = "dllwrap" -+ self.linker_dll_cxx = "dllwrap" - - # ld_version >= "2.13" support -shared so use it instead of - # -mdll -static -@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler): - self.set_executables(compiler='gcc -mcygwin -O -Wall', - compiler_so='gcc -mcygwin -mdll -O -Wall', - compiler_cxx='g++ -mcygwin -O -Wall', -+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', - linker_exe='gcc -mcygwin', - linker_so=('%s -mcygwin %s' % -- (self.linker_dll, shared_option))) -+ (self.linker_dll, shared_option)), -+ linker_exe_cxx='g++ -mcygwin', -+ linker_so_cxx=('%s -mcygwin %s' % -+ (self.linker_dll_cxx, shared_option))) - - # cygwin and mingw32 need different sets of libraries - if self.gcc_version == "2.91.57": -@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler): - raise CompileError(msg) - else: # for other files use the C-compiler - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError as msg: - raise CompileError(msg) - -@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler): - self.set_executables(compiler='gcc -O -Wall', - compiler_so='gcc -mdll -O -Wall', - compiler_cxx='g++ -O -Wall', -+ compiler_so_cxx='g++ -mdll -O -Wall', - linker_exe='gcc', - linker_so='%s %s %s' - % (self.linker_dll, shared_option, -+ entry_point), -+ linker_exe_cxx='g++', -+ linker_so_cxx='%s %s %s' -+ % (self.linker_dll_cxx, shared_option, - entry_point)) - # Maybe we should also append -mthreads, but then the finished - # dlls need another dll (mingwm10.dll see Mingw32 docs) ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -170,9 +170,11 @@ def customize_compiler(compiler): - _osx_support.customize_compiler(_config_vars) - _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' - -- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'CFLAGS', -- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') -+ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ -+ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') -+ -+ cxxflags = cflags - - if 'CC' in os.environ: - newcc = os.environ['CC'] -@@ -187,19 +189,27 @@ def customize_compiler(compiler): - cxx = os.environ['CXX'] - if 'LDSHARED' in os.environ: - ldshared = os.environ['LDSHARED'] -+ if 'LDCXXSHARED' in os.environ: -+ ldcxxshared = os.environ['LDCXXSHARED'] - if 'CPP' in os.environ: - cpp = os.environ['CPP'] - else: - cpp = cc + " -E" # not always - if 'LDFLAGS' in os.environ: - ldshared = ldshared + ' ' + os.environ['LDFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] - if 'CFLAGS' in os.environ: -- cflags = cflags + ' ' + os.environ['CFLAGS'] -+ cflags = os.environ['CFLAGS'] - ldshared = ldshared + ' ' + os.environ['CFLAGS'] -+ if 'CXXFLAGS' in os.environ: -+ cxxflags = os.environ['CXXFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] - if 'CPPFLAGS' in os.environ: - cpp = cpp + ' ' + os.environ['CPPFLAGS'] - cflags = cflags + ' ' + os.environ['CPPFLAGS'] -+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] - ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] - if 'AR' in os.environ: - ar = os.environ['AR'] - if 'ARFLAGS' in os.environ: -@@ -208,13 +218,17 @@ def customize_compiler(compiler): - archiver = ar + ' ' + ar_flags - - cc_cmd = cc + ' ' + cflags -+ cxx_cmd = cxx + ' ' + cxxflags - compiler.set_executables( - preprocessor=cpp, - compiler=cc_cmd, - compiler_so=cc_cmd + ' ' + ccshared, -- compiler_cxx=cxx, -+ compiler_cxx=cxx_cmd, -+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, - linker_so=ldshared, - linker_exe=cc, -+ linker_so_cxx=ldcxxshared, -+ linker_exe_cxx=cxx, - archiver=archiver) - - compiler.shared_lib_extension = shlib_suffix ---- a/Lib/distutils/unixccompiler.py -+++ b/Lib/distutils/unixccompiler.py -@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler): - # are pretty generic; they will probably have to be set by an outsider - # (eg. using information discovered by the sysconfig about building - # Python extensions). -- executables = {'preprocessor' : None, -- 'compiler' : ["cc"], -- 'compiler_so' : ["cc"], -- 'compiler_cxx' : ["cc"], -- 'linker_so' : ["cc", "-shared"], -- 'linker_exe' : ["cc"], -- 'archiver' : ["ar", "-cr"], -- 'ranlib' : None, -+ executables = {'preprocessor' : None, -+ 'compiler' : ["cc"], -+ 'compiler_so' : ["cc"], -+ 'compiler_cxx' : ["c++"], -+ 'compiler_so_cxx' : ["c++"], -+ 'linker_so' : ["cc", "-shared"], -+ 'linker_exe' : ["cc"], -+ 'linker_so_cxx' : ["c++", "-shared"], -+ 'linker_exe_cxx' : ["c++"], -+ 'archiver' : ["ar", "-cr"], -+ 'ranlib' : None, - } - - if sys.platform[:6] == "darwin": -@@ -110,12 +113,19 @@ class UnixCCompiler(CCompiler): - - def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - compiler_so = self.compiler_so -+ compiler_so_cxx = self.compiler_so_cxx - if sys.platform == 'darwin': - compiler_so = _osx_support.compiler_fixup(compiler_so, - cc_args + extra_postargs) -+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, -+ cc_args + extra_postargs) - try: -- self.spawn(compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError as msg: - raise CompileError(msg) - -@@ -173,30 +183,16 @@ class UnixCCompiler(CCompiler): - ld_args.extend(extra_postargs) - self.mkpath(os.path.dirname(output_filename)) - try: -- if target_desc == CCompiler.EXECUTABLE: -- linker = self.linker_exe[:] -+ if target_lang == "c++": -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe_cxx[:] -+ else: -+ linker = self.linker_so_cxx[:] - else: -- linker = self.linker_so[:] -- if target_lang == "c++" and self.compiler_cxx: -- # skip over environment variable settings if /usr/bin/env -- # is used to set up the linker's environment. -- # This is needed on OSX. Note: this assumes that the -- # normal and C++ compiler have the same environment -- # settings. -- i = 0 -- if os.path.basename(linker[0]) == "env": -- i = 1 -- while '=' in linker[i]: -- i += 1 -- -- if os.path.basename(linker[i]) == 'ld_so_aix': -- # AIX platforms prefix the compiler with the ld_so_aix -- # script, so we need to adjust our linker index -- offset = 1 -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe[:] - else: -- offset = 0 -- -- linker[i+offset] = self.compiler_cxx[i] -+ linker = self.linker_so[:] - - if sys.platform == 'darwin': - linker = _osx_support.compiler_fixup(linker, ld_args) ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -584,10 +584,10 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o - *\ -s*|s*) quiet="-q";; \ - *) quiet="";; \ - esac; \ -- echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ -+ echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ -- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ -+ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build - diff --git a/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch deleted file mode 100644 index 41d3ab52345b..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.8/no-ldconfig.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001 -From: Greg Roodt -Date: Wed, 9 Dec 2020 17:59:24 +1100 -Subject: [PATCH] Don't use ldconfig - ---- - Lib/ctypes/util.py | 77 ++-------------------------------------------- - 1 file changed, 2 insertions(+), 75 deletions(-) - -diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 0c2510e161..7fb98af308 100644 ---- a/Lib/ctypes/util.py -+++ b/Lib/ctypes/util.py -@@ -100,53 +100,7 @@ elif os.name == "posix": - return thefile.read(4) == elf_header - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.findall(expr, trace) -- if not res: -- return None -- -- for file in res: -- # Check if the given file is an elf file: gcc can report -- # some files that are linker scripts and not actual -- # shared objects. See bpo-41976 for more details -- if not _is_elf(file): -- continue -- return os.fsdecode(file) -+ return None - - - if sys.platform == "sunos5": -@@ -268,34 +222,7 @@ elif os.name == "posix": - else: - - def _findSoname_ldconfig(name): -- import struct -- if struct.calcsize('l') == 4: -- machine = os.uname().machine + '-32' -- else: -- machine = os.uname().machine + '-64' -- mach_map = { -- 'x86_64-64': 'libc6,x86-64', -- 'ppc64-64': 'libc6,64bit', -- 'sparc64-64': 'libc6,64bit', -- 's390x-64': 'libc6,64bit', -- 'ia64-64': 'libc6,IA-64', -- } -- abi_type = mach_map.get(machine, 'libc6') -- -- # XXX assuming GLIBC's ldconfig (with option -p) -- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' -- regex = os.fsencode(regex % (re.escape(name), abi_type)) -- try: -- with subprocess.Popen(['/sbin/ldconfig', '-p'], -- stdin=subprocess.DEVNULL, -- stderr=subprocess.DEVNULL, -- stdout=subprocess.PIPE, -- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: -- res = re.search(regex, p.stdout.read()) -- if res: -- return os.fsdecode(res.group(1)) -- except OSError: -- pass -+ return None - - def _findLib_ld(name): - # See issue #9998 for why this is needed --- -2.24.3 (Apple Git-128) diff --git a/pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch b/pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch deleted file mode 100644 index a9b0c0677c5e..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/setup.py b/setup.py -index 04eb6b2..2e1160d 100644 ---- a/setup.py -+++ b/setup.py -@@ -1981,8 +1981,8 @@ class PyBuildExt(build_ext): - # Rather than complicate the code below, detecting and building - # AquaTk is a separate method. Only one Tkinter will be built on - # Darwin - either AquaTk, if it is found, or X11 based Tk. -- if (MACOS and self.detect_tkinter_darwin()): -- return True -+ # if (MACOS and self.detect_tkinter_darwin()): -+ # return True - - # Assume we haven't found any of the libraries or include files - # The versions with dots are used on Unix, and the versions without diff --git a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch deleted file mode 100644 index 1a5eccb9eca8..000000000000 --- a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 66f492d2eda94bd64db833839a325caf6ba0fed5 Mon Sep 17 00:00:00 2001 -From: Greg Roodt -Date: Wed, 9 Dec 2020 17:59:24 +1100 -Subject: [PATCH] Don't use ldconfig - ---- - Lib/ctypes/util.py | 77 ++-------------------------------------------- - 1 file changed, 2 insertions(+), 75 deletions(-) - -diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 0c2510e161..7fb98af308 100644 ---- a/Lib/ctypes/util.py -+++ b/Lib/ctypes/util.py -@@ -268,34 +222,7 @@ elif os.name == "posix": - else: - - def _findSoname_ldconfig(name): -- import struct -- if struct.calcsize('l') == 4: -- machine = os.uname().machine + '-32' -- else: -- machine = os.uname().machine + '-64' -- mach_map = { -- 'x86_64-64': 'libc6,x86-64', -- 'ppc64-64': 'libc6,64bit', -- 'sparc64-64': 'libc6,64bit', -- 's390x-64': 'libc6,64bit', -- 'ia64-64': 'libc6,IA-64', -- } -- abi_type = mach_map.get(machine, 'libc6') -- -- # XXX assuming GLIBC's ldconfig (with option -p) -- regex = r'\s+(lib%s\.[^\s]+)\s+\(%s' -- regex = os.fsencode(regex % (re.escape(name), abi_type)) -- try: -- with subprocess.Popen(['/sbin/ldconfig', '-p'], -- stdin=subprocess.DEVNULL, -- stderr=subprocess.DEVNULL, -- stdout=subprocess.PIPE, -- env={'LC_ALL': 'C', 'LANG': 'C'}) as p: -- res = re.search(regex, p.stdout.read()) -- if res: -- return os.fsdecode(res.group(1)) -- except OSError: -- pass -+ return None - - def _findLib_ld(name): - # See issue #9998 for why this is needed --- -2.24.3 (Apple Git-128) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index b0fd13b6a928..c4325a4494f5 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -362,19 +362,13 @@ stdenv.mkDerivation (finalAttrs: { # Make the mimetypes module refer to the right file ./mimetypes.patch ] - ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [ - # Stop checking for TCL/TK in global macOS locations - ./3.9/darwin-tcl-tk.patch - ] ++ optionals (hasDistutilsCxxPatch && pythonOlder "3.12") [ # Fix for http://bugs.python.org/issue1222585 # Upstream distutils is calling C compiler to compile C++ code, which # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. ( - if pythonAtLeast "3.7" && pythonOlder "3.11" then - ./3.7/python-3.x-distutils-C++.patch - else if pythonAtLeast "3.11" then + if pythonAtLeast "3.11" then ./3.11/python-3.x-distutils-C++.patch else fetchpatch { @@ -794,11 +788,6 @@ stdenv.mkDerivation (finalAttrs: { inherit src; name = "python${pythonVersion}-${version}-doc"; - postPatch = lib.optionalString (pythonAtLeast "3.9" && pythonOlder "3.11") '' - substituteInPlace Doc/tools/extensions/pyspecific.py \ - --replace-fail "from sphinx.util import status_iterator" "from sphinx.util.display import status_iterator" - ''; - dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 2e3bc851f5ad..2f97f6fbc6f0 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -42,18 +42,6 @@ inherit passthruFun; }; - python310 = callPackage ./cpython { - self = __splicedPackages.python310; - sourceVersion = { - major = "3"; - minor = "10"; - patch = "19"; - suffix = ""; - }; - hash = "sha256-yPSlllciAdgd19+R9w4XfhmnDx1ImWi1S1+78pqXwHY="; - inherit passthruFun; - }; - python311 = callPackage ./cpython { self = __splicedPackages.python311; sourceVersion = { diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 58a6cc2c70b6..042fd47e8661 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -82,17 +82,12 @@ let "installer" ]; - isBootstrapPackage' = flip elem ( - [ - "build" - "packaging" - "pyproject-hooks" - "wheel" - ] - ++ optionals (python.pythonOlder "3.11") [ - "tomli" - ] - ); + isBootstrapPackage' = flip elem [ + "build" + "packaging" + "pyproject-hooks" + "wheel" + ]; isSetuptoolsDependency' = flip elem [ "setuptools" diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index 8b930de5f394..e302e9b6bdc0 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -110,10 +110,6 @@ let in rec { isPy27 = pythonVersion == "2.7"; - isPy37 = pythonVersion == "3.7"; - isPy38 = pythonVersion == "3.8"; - isPy39 = pythonVersion == "3.9"; - isPy310 = pythonVersion == "3.10"; isPy311 = pythonVersion == "3.11"; isPy312 = pythonVersion == "3.12"; isPy313 = pythonVersion == "3.13"; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 41240a3decc3..bee93cf1451f 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -353,13 +353,6 @@ stdenv.mkDerivation rec { "test_inspect" "test_pydoc" "test_warnings" - ] - ++ lib.optionals isPy310 [ - "test_contextlib_async" - "test_future" - "test_lzma" - "test_module" - "test_typing" ]; in '' diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 77ac26630161..6fbeb7301215 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -168,10 +168,6 @@ in inherit lib pkgs stdenv; inherit (python.passthru) isPy27 - isPy37 - isPy38 - isPy39 - isPy310 isPy311 isPy312 isPy313 diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index c1be4d3beed6..c98d1bb4d43c 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -129,9 +129,6 @@ let inherit hash; }; - # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. - NROFF = if docSupport then "${groff}/bin/nroff" else null; - outputs = [ "out" ] ++ lib.optional docSupport "devdoc"; strictDeps = true; @@ -174,12 +171,17 @@ let ]; propagatedBuildInputs = op jemallocSupport jemalloc; - env = lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && yjitSupport) { - # The ruby build system will use a bare `rust` command by default for its rust. - # We can use the Nixpkgs rust wrapper to work around the fact that our Rust builds - # for cross-compilation output for the build target by default. - NIX_RUSTFLAGS = "--target ${stdenv.hostPlatform.rust.rustcTargetSpec}"; - }; + env = + lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform && yjitSupport) { + # The ruby build system will use a bare `rust` command by default for its rust. + # We can use the Nixpkgs rust wrapper to work around the fact that our Rust builds + # for cross-compilation output for the build target by default. + NIX_RUSTFLAGS = "--target ${stdenv.hostPlatform.rust.rustcTargetSpec}"; + } + // lib.optionalAttrs docSupport { + # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. + NROFF = "${groff}/bin/nroff"; + }; enableParallelBuilding = true; # /build/ruby-2.7.7/lib/fileutils.rb:882:in `chmod': diff --git a/pkgs/development/python-modules/aemet-opendata/default.nix b/pkgs/development/python-modules/aemet-opendata/default.nix index cda44af11dca..2ef3e4997a97 100644 --- a/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/pkgs/development/python-modules/aemet-opendata/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, geopy, - pythonOlder, setuptools, }: @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "0.6.4"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "Noltari"; repo = "AEMET-OpenData"; diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 2f21eb0610a3..d21337899238 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -13,7 +13,6 @@ pyicu, pytestCheckHook, python-slugify, - pythonOlder, pytimeparse, setuptools, }: diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 50b0e989fb21..1163d72f6f5e 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, pyvex, setuptools, typing-extensions, @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "9.2.158"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "angr"; repo = "ailment"; diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 9883a1c77e50..8f8e6d0d51ea 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -3,7 +3,6 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, }: @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "0.7.2"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "Noltari"; repo = "aioairzone-cloud"; diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index 8331268a1415..6553e5e80836 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -11,7 +11,6 @@ pytestCheckHook, python-engineio, python-socketio, - pythonOlder, websockets, yarl, }: @@ -21,8 +20,6 @@ buildPythonPackage rec { version = "2025.02.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "bachya"; repo = "aioambient"; diff --git a/pkgs/development/python-modules/aiobtclientrpc/default.nix b/pkgs/development/python-modules/aiobtclientrpc/default.nix index c0fcd7472142..631e1cabbb24 100644 --- a/pkgs/development/python-modules/aiobtclientrpc/default.nix +++ b/pkgs/development/python-modules/aiobtclientrpc/default.nix @@ -45,8 +45,7 @@ buildPythonPackage (finalAttrs: { httpx-socks python-socks rencode - ] - ++ python-socks.optional-dependencies.asyncio; + ]; nativeCheckInputs = [ proxy-py diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index f25c181fde24..ad2d5cf3fd52 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -6,7 +6,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, setuptools, }: diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 92ca881060e7..6b5ad40fb2bc 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -1,7 +1,6 @@ { lib, aiodns, - async-timeout, buildPythonPackage, cached-ipaddress, fetchFromGitHub, @@ -12,7 +11,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -35,9 +33,6 @@ buildPythonPackage rec { ifaddr netifaces pyroute2 - ] - ++ lib.optionals (pythonOlder "3.11") [ - async-timeout ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aioelectricitymaps/default.nix b/pkgs/development/python-modules/aioelectricitymaps/default.nix index 3155a9eb443e..3405e724358c 100644 --- a/pkgs/development/python-modules/aioelectricitymaps/default.nix +++ b/pkgs/development/python-modules/aioelectricitymaps/default.nix @@ -10,7 +10,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, syrupy, }: @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "1.1.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "jpbede"; repo = "aioelectricitymaps"; diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 68eefa41a963..2527a31b9eea 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -10,7 +10,6 @@ pytest-aiohttp, pytest-asyncio, pytestCheckHook, - pythonOlder, voluptuous, typing-extensions, yarl, @@ -21,8 +20,6 @@ buildPythonPackage (finalAttrs: { version = "2026.01.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "bachya"; repo = "aioguardian"; diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 87ce910a3644..13b2c634fe3f 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -23,8 +23,7 @@ buildPythonPackage rec { dependencies = [ aiohttp python-socks - ] - ++ python-socks.optional-dependencies.asyncio; + ]; # Checks needs internet access doCheck = false; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 11c3ded60602..615c17b38ca5 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, replaceVars, - isPy310, isPyPy, pythonOlder, @@ -96,9 +95,6 @@ buildPythonPackage rec { propcache yarl ] - ++ lib.optionals (pythonOlder "3.11") [ - async-timeout - ] ++ optional-dependencies.speedups; optional-dependencies.speedups = [ @@ -141,11 +137,6 @@ buildPythonPackage rec { # Cannot connect to host example.com:443 ssl:default [Could not contact DNS servers] "test_tcp_connector_ssl_shutdown_timeout_passed_to_create_connection" ] - # these tests fail with python310 but succeeds with 11+ - ++ lib.optionals isPy310 [ - "test_https_proxy_unsupported_tls_in_tls" - "test_tcp_connector_raise_connector_ssl_error" - ] ++ lib.optionals stdenv.hostPlatform.is32bit [ "test_cookiejar" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0 diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 7c8b5a084264..379bc6ad3144 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -1,13 +1,11 @@ { lib, aiohttp, - async-timeout, buildPythonPackage, fetchFromGitHub, pytest-aiohttp, pytest-cov-stub, pytestCheckHook, - pythonOlder, setuptools, }: @@ -25,8 +23,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ async-timeout ]; - optional-dependencies = { aiohttp = [ aiohttp ]; }; diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix index 70bd17312027..fe77e9b2a321 100644 --- a/pkgs/development/python-modules/aiolyric/default.nix +++ b/pkgs/development/python-modules/aiolyric/default.nix @@ -5,7 +5,6 @@ buildPythonPackage, fetchFromGitHub, incremental, - pythonOlder, pytest-asyncio, pytestCheckHook, setuptools, @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "2.0.2"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "timmo001"; repo = "aiolyric"; diff --git a/pkgs/development/python-modules/aiomcache/default.nix b/pkgs/development/python-modules/aiomcache/default.nix index f4122d34ab2f..38b4bbe13a62 100644 --- a/pkgs/development/python-modules/aiomcache/default.nix +++ b/pkgs/development/python-modules/aiomcache/default.nix @@ -2,14 +2,12 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system setuptools, # dependencies python-memcached, - typing-extensions, }: buildPythonPackage rec { @@ -26,7 +24,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ python-memcached ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + dependencies = [ python-memcached ]; doCheck = false; # executes memcached in docker diff --git a/pkgs/development/python-modules/aionut/default.nix b/pkgs/development/python-modules/aionut/default.nix index 808ef7513651..e16ca31d3daf 100644 --- a/pkgs/development/python-modules/aionut/default.nix +++ b/pkgs/development/python-modules/aionut/default.nix @@ -6,7 +6,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "4.3.4"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "bdraco"; repo = "aionut"; diff --git a/pkgs/development/python-modules/aiooncue/default.nix b/pkgs/development/python-modules/aiooncue/default.nix index db8031800ba8..02f32768d0c6 100644 --- a/pkgs/development/python-modules/aiooncue/default.nix +++ b/pkgs/development/python-modules/aiooncue/default.nix @@ -3,7 +3,6 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, }: @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "0.3.9"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "bdraco"; repo = "aiooncue"; diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 3e6f1fa45992..12ecf2f9b239 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -9,7 +9,6 @@ pytest-aiohttp, pytest-cov-stub, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "0.6.21"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index 5ca2a02a6435..3c8efb5eae08 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -5,7 +5,6 @@ buildPythonPackage, fetchFromGitHub, pillow, - pythonOlder, setuptools, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "3.1.5"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "aioslimproto"; diff --git a/pkgs/development/python-modules/aiosonos/default.nix b/pkgs/development/python-modules/aiosonos/default.nix index 4c0793a299e9..ae3ca97a8b6d 100644 --- a/pkgs/development/python-modules/aiosonos/default.nix +++ b/pkgs/development/python-modules/aiosonos/default.nix @@ -7,7 +7,6 @@ brotli, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, }: @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "0.1.9"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "music-assistant"; repo = "aiosonos"; diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index 511466c5c3ad..8dcda91cbe91 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -8,7 +8,6 @@ pytest-asyncio, pytest-postgresql, pytestCheckHook, - pythonOlder, setuptools, setuptools-scm, sphinx-rtd-theme, diff --git a/pkgs/development/python-modules/aiotankerkoenig/default.nix b/pkgs/development/python-modules/aiotankerkoenig/default.nix index 102be8f760e0..2116f1c96d33 100644 --- a/pkgs/development/python-modules/aiotankerkoenig/default.nix +++ b/pkgs/development/python-modules/aiotankerkoenig/default.nix @@ -10,7 +10,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, syrupy, yarl, }: @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "jpbede"; repo = "aiotankerkoenig"; diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix index 0c57466754c7..857cba015c20 100644 --- a/pkgs/development/python-modules/aiovlc/default.nix +++ b/pkgs/development/python-modules/aiovlc/default.nix @@ -7,7 +7,6 @@ pytest-cov-stub, pytest-timeout, pytestCheckHook, - pythonOlder, typer, }: @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "0.6.6"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "MartinHjelmare"; repo = "aiovlc"; diff --git a/pkgs/development/python-modules/aiowaqi/default.nix b/pkgs/development/python-modules/aiowaqi/default.nix index 9d79de96384e..01fc555be2df 100644 --- a/pkgs/development/python-modules/aiowaqi/default.nix +++ b/pkgs/development/python-modules/aiowaqi/default.nix @@ -8,7 +8,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, syrupy, yarl, }: @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "3.1.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "joostlek"; repo = "python-waqi"; diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix index 2157dd1028db..7ffa4ddb205b 100644 --- a/pkgs/development/python-modules/aiowebostv/default.nix +++ b/pkgs/development/python-modules/aiowebostv/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, aiohttp, }: @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "0.7.5"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "aiowebostv"; diff --git a/pkgs/development/python-modules/aiowithings/default.nix b/pkgs/development/python-modules/aiowithings/default.nix index e58cd3644d3a..5e9e6f7ac3c5 100644 --- a/pkgs/development/python-modules/aiowithings/default.nix +++ b/pkgs/development/python-modules/aiowithings/default.nix @@ -8,7 +8,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, syrupy, yarl, }: @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "3.1.6"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "joostlek"; repo = "python-withings"; diff --git a/pkgs/development/python-modules/airgradient/default.nix b/pkgs/development/python-modules/airgradient/default.nix index ab0d2aa1a7e1..e54989874a6b 100644 --- a/pkgs/development/python-modules/airgradient/default.nix +++ b/pkgs/development/python-modules/airgradient/default.nix @@ -10,7 +10,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, syrupy, yarl, }: @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "0.9.2"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "airgradienthq"; repo = "python-airgradient"; diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix index 92894369c2b9..a0ed8c3d2baf 100644 --- a/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/pkgs/development/python-modules/alarmdecoder/default.nix @@ -7,7 +7,6 @@ pyopenssl, pyserial, pytestCheckHook, - pythonOlder, pyusb, setuptools-scm, }: diff --git a/pkgs/development/python-modules/allantools/default.nix b/pkgs/development/python-modules/allantools/default.nix index ea30c65cad47..bee02d49a251 100644 --- a/pkgs/development/python-modules/allantools/default.nix +++ b/pkgs/development/python-modules/allantools/default.nix @@ -8,7 +8,6 @@ numpydoc, pytest, scipy, - pythonOlder, pytestCheckHook, }: diff --git a/pkgs/development/python-modules/allure-python-commons/default.nix b/pkgs/development/python-modules/allure-python-commons/default.nix index fbaa86257722..4c842c893d4b 100644 --- a/pkgs/development/python-modules/allure-python-commons/default.nix +++ b/pkgs/development/python-modules/allure-python-commons/default.nix @@ -2,7 +2,6 @@ lib, fetchPypi, buildPythonPackage, - pythonOlder, attrs, pluggy, six, diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 92287d5dd407..97981c960938 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -24,7 +24,6 @@ pycparser, pyformlang, pydemumble, - pythonOlder, pyvex, rich, rpyc, @@ -41,8 +40,6 @@ buildPythonPackage rec { version = "9.2.193"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "angr"; repo = "angr"; diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 915a53c56560..84be3d90c8cd 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -48,9 +48,6 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.13") [ typing-extensions - ] - ++ lib.optionals (pythonOlder "3.11") [ - exceptiongroup ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/apple-weatherkit/default.nix b/pkgs/development/python-modules/apple-weatherkit/default.nix index cd38737c53c5..a9afaa51b4b3 100644 --- a/pkgs/development/python-modules/apple-weatherkit/default.nix +++ b/pkgs/development/python-modules/apple-weatherkit/default.nix @@ -5,7 +5,6 @@ poetry-core, aiohttp, aiohttp-retry, - pythonOlder, pyjwt, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "1.1.3"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "tjhorner"; repo = "python-weatherkit"; diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix index f94fb291c401..869a7f59d763 100644 --- a/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/pkgs/development/python-modules/arcam-fmj/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, pythonAtLeast, - pythonOlder, fetchFromGitHub, setuptools, aiohttp, @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "elupus"; repo = "arcam_fmj"; diff --git a/pkgs/development/python-modules/argparse-manpage/default.nix b/pkgs/development/python-modules/argparse-manpage/default.nix index 81c73582462d..f7eb657af2f6 100644 --- a/pkgs/development/python-modules/argparse-manpage/default.nix +++ b/pkgs/development/python-modules/argparse-manpage/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, packaging, - tomli, pytestCheckHook, pip, }: @@ -25,10 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools packaging - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - - propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix index ff4d552842b2..bdf5d67d6312 100644 --- a/pkgs/development/python-modules/array-record/default.nix +++ b/pkgs/development/python-modules/array-record/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, pythonAtLeast, python, fetchPypi, @@ -14,7 +13,7 @@ buildPythonPackage rec { version = "0.8.3"; format = "wheel"; - disabled = pythonOlder "3.11" || pythonAtLeast "3.15"; + disabled = pythonAtLeast "3.15"; src = let diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 16293f1b8a6a..0403878fb70e 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, - typing-extensions, pip, pylint, pytestCheckHook, @@ -24,8 +22,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; - dependencies = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; - nativeCheckInputs = [ pip pytestCheckHook diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 105a23588120..639e234acbb0 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - pythonOlder, # build time stdenv, @@ -58,8 +57,6 @@ buildPythonPackage rec { version = "7.2.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "astropy"; repo = "astropy"; diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index da910f18b6dd..ee6e876f9cbd 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -1,10 +1,8 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, setuptools, - typing-extensions, pytestCheckHook, pytest-asyncio, pytest-cov-stub, @@ -25,8 +23,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; - nativeCheckInputs = [ pytestCheckHook pytest-asyncio diff --git a/pkgs/development/python-modules/async-stagger/default.nix b/pkgs/development/python-modules/async-stagger/default.nix index 66911a84e4f8..3f545c3e5f95 100644 --- a/pkgs/development/python-modules/async-stagger/default.nix +++ b/pkgs/development/python-modules/async-stagger/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, pytestCheckHook, pytest-asyncio, @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "0.4.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "twisteroidambassador"; repo = "async_stagger"; diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 18ba323d79eb..705822b52d97 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -2,12 +2,10 @@ lib, fetchPypi, buildPythonPackage, - async-timeout, cython, libpq, uvloop, postgresql, - pythonOlder, pytest-xdist, pytest8_3CheckHook, setuptools, @@ -29,10 +27,6 @@ buildPythonPackage rec { setuptools ]; - # required for compatibility with Python versions older than 3.11 - # see https://github.com/MagicStack/asyncpg/blob/v0.29.0/asyncpg/_asyncio_compat.py#L13 - dependencies = lib.optionals (pythonOlder "3.11") [ async-timeout ]; - nativeCheckInputs = [ libpq.pg_config uvloop diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 052d8d31002a..e3302683a2c7 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -31,8 +31,7 @@ buildPythonPackage rec { python-socks tldextract whodap - ] - ++ python-socks.optional-dependencies.asyncio; + ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/atproto/default.nix b/pkgs/development/python-modules/atproto/default.nix index 4e180ed4314f..8d6ffc08b509 100644 --- a/pkgs/development/python-modules/atproto/default.nix +++ b/pkgs/development/python-modules/atproto/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - pythonOlder, nix-update-script, # build-system diff --git a/pkgs/development/python-modules/autoflake/default.nix b/pkgs/development/python-modules/autoflake/default.nix index fe0a567801cd..88f59f4436cd 100644 --- a/pkgs/development/python-modules/autoflake/default.nix +++ b/pkgs/development/python-modules/autoflake/default.nix @@ -5,8 +5,6 @@ hatchling, pyflakes, pytestCheckHook, - pythonOlder, - tomli, }: buildPythonPackage rec { pname = "autoflake"; @@ -20,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ pyflakes ] ++ lib.optional (pythonOlder "3.11") tomli; + propagatedBuildInputs = [ pyflakes ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 423671330af7..dc599ac6af13 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -5,9 +5,7 @@ glibcLocales, pycodestyle, pytestCheckHook, - pythonOlder, setuptools, - tomli, }: buildPythonPackage rec { @@ -24,7 +22,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - propagatedBuildInputs = [ pycodestyle ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + propagatedBuildInputs = [ pycodestyle ]; nativeCheckInputs = [ glibcLocales diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 2bef3696e7f3..a21b7d319dd2 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -6,7 +6,6 @@ azure-common, azure-mgmt-core, setuptools, - pythonOlder, }: buildPythonPackage rec { @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "4.1.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { pname = "azure_mgmt_applicationinsights"; inherit version; diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index 70b68479f2e4..1f8119d6ccaf 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -5,7 +5,6 @@ buildPythonPackage, fetchPypi, isodate, - pythonOlder, setuptools, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "4.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { pname = "azure_mgmt_iothub"; inherit version; diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index cdbcfee0fd35..1a3a47688a40 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -5,7 +5,6 @@ buildPythonPackage, fetchPypi, isodate, - pythonOlder, setuptools, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "4.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { pname = "azure_mgmt_recoveryservices"; inherit version; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index d5ea3c88bdc2..3f85644f13bc 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -7,7 +7,6 @@ pytest-asyncio, pytest-timeout, pytestCheckHook, - pythonOlder, setuptools, voluptuous, zigpy, diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index 687b6f3e80b5..a50e9f70d991 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -53,7 +53,6 @@ python-dateutil, python-json-logger, python-multipart, - pythonOlder, pyyaml, questionary, rich, @@ -62,7 +61,6 @@ simple-di, starlette, tomli-w, - tomli, tritonclient, uv, uvicorn, @@ -205,8 +203,7 @@ buildPythonPackage { uv uvicorn watchfiles - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; inherit optional-dependencies; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index c406f2f361c6..ea56257d981f 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchPypi, fetchpatch, - pythonOlder, pytestCheckHook, aiohttp, click, @@ -19,8 +18,6 @@ parameterized, platformdirs, tokenize-rt, - tomli, - typing-extensions, uvloop, }: @@ -64,10 +61,6 @@ buildPythonPackage rec { packaging pathspec platformdirs - ] - ++ lib.optionals (pythonOlder "3.11") [ - tomli - typing-extensions ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index a4f9b495b621..a15eeaf5da4e 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -9,7 +9,6 @@ pytestCheckHook, pytest-asyncio, pytest-cov-stub, - pythonOlder, stdenv, }: diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index ca5d23fe6221..13e38b84069f 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -16,7 +16,6 @@ pyobjc-framework-CoreBluetooth, pyobjc-framework-libdispatch, typing-extensions, - async-timeout, pytest-asyncio, pytest-cov-stub, @@ -61,9 +60,6 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions - ] - ++ lib.optionals (pythonOlder "3.11") [ - async-timeout ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/bluecurrent-api/default.nix b/pkgs/development/python-modules/bluecurrent-api/default.nix index e4caa00e048a..5d66b378581f 100644 --- a/pkgs/development/python-modules/bluecurrent-api/default.nix +++ b/pkgs/development/python-modules/bluecurrent-api/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, setuptools, pytz, @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "1.3.3"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "bluecurrent"; repo = "HomeAssistantAPI"; diff --git a/pkgs/development/python-modules/bluemaestro-ble/default.nix b/pkgs/development/python-modules/bluemaestro-ble/default.nix index 490df29f727f..f82d98d94150 100644 --- a/pkgs/development/python-modules/bluemaestro-ble/default.nix +++ b/pkgs/development/python-modules/bluemaestro-ble/default.nix @@ -7,7 +7,6 @@ poetry-core, pytest-cov-stub, pytestCheckHook, - pythonOlder, sensor-state-data, }: @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "bluemaestro-ble"; diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 30df366c2791..c122b644d9ac 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -1,6 +1,5 @@ { lib, - async-timeout, bluetooth-adapters, btsocket, buildPythonPackage, @@ -10,7 +9,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, usb-devices, }: @@ -33,9 +31,6 @@ buildPythonPackage rec { btsocket pyric usb-devices - ] - ++ lib.optionals (pythonOlder "3.11") [ - async-timeout ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index 9a6376896df1..764278e52dca 100644 --- a/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -6,7 +6,6 @@ poetry-core, pytest-cov-stub, pytestCheckHook, - pythonOlder, sensor-state-data, }: @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "1.9.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "bluetooth-sensor-state-data"; diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index 1a5e3a66fa9a..6c4e3c3bc4a4 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -4,14 +4,12 @@ callPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, setuptools, build, coloredlogs, packaging, pip, - toml, urllib3, }: @@ -43,8 +41,7 @@ buildPythonPackage rec { packaging pip urllib3 - ] - ++ lib.optionals (pythonOlder "3.11") [ toml ]; + ]; pythonImportsCheck = [ "bork" diff --git a/pkgs/development/python-modules/bqplot/default.nix b/pkgs/development/python-modules/bqplot/default.nix index 09e8ba7da7a0..b743da34f1d4 100644 --- a/pkgs/development/python-modules/bqplot/default.nix +++ b/pkgs/development/python-modules/bqplot/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, jupyter-packaging, jupyterlab, diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 2cdc72c4a63e..01145766af4d 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -12,9 +12,7 @@ pytest-rerunfailures, pytest-xdist, pytestCheckHook, - pythonOlder, setuptools, - tomli, virtualenv, wheel, }: @@ -38,8 +36,7 @@ buildPythonPackage rec { dependencies = [ packaging pyproject-hooks - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; # We need to disable tests because this package is part of the bootstrap chain # and its test dependencies cannot be built yet when this is being built. diff --git a/pkgs/development/python-modules/bundlewrap/default.nix b/pkgs/development/python-modules/bundlewrap/default.nix index cedde8f43421..14b3f5ab212e 100644 --- a/pkgs/development/python-modules/bundlewrap/default.nix +++ b/pkgs/development/python-modules/bundlewrap/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - pythonOlder, bcrypt, cryptography, jinja2, @@ -12,7 +11,6 @@ passlib, pyyaml, requests, - rtoml, setuptools, tomlkit, pytestCheckHook, @@ -44,8 +42,7 @@ buildPythonPackage (finalAttrs: { requests tomlkit librouteros - ] - ++ lib.optionals (pythonOlder "3.11") [ rtoml ]; + ]; pythonImportsCheck = [ "bundlewrap" ]; diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index 670f51a6ea90..078a9fc50324 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, cbor2, fetchFromGitHub, - exceptiongroup, hatchling, hatch-vcs, hypothesis, @@ -16,7 +15,6 @@ pytest-xdist, pytestCheckHook, pythonAtLeast, - pythonOlder, pyyaml, tomlkit, typing-extensions, @@ -43,9 +41,6 @@ buildPythonPackage rec { dependencies = [ attrs typing-extensions - ] - ++ lib.optionals (pythonOlder "3.11") [ - exceptiongroup ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 9a05b05faa09..2d64160724b3 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -5,7 +5,6 @@ hypothesis, pytest-cov-stub, pytestCheckHook, - pythonOlder, setuptools-scm, setuptools, withCExtensions ? true, diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 32d860d2d01d..60a11b371a55 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -8,8 +8,6 @@ pep517, pytestCheckHook, setuptools, - tomli, - pythonOlder, }: buildPythonPackage rec { @@ -30,8 +28,7 @@ buildPythonPackage rec { build pep517 setuptools - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; nativeCheckInputs = [ git diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix index 7aa4c13c52b4..529da0fe4228 100644 --- a/pkgs/development/python-modules/checkdmarc/default.nix +++ b/pkgs/development/python-modules/checkdmarc/default.nix @@ -12,7 +12,6 @@ pyleri, pyopenssl, pytestCheckHook, - pythonOlder, requests, timeout-decorator, xmltodict, diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 2ffb1e6a2c2c..e48bc9bfa047 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, pysmt, pytestCheckHook, - pythonOlder, setuptools, typing-extensions, z3-solver, @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "9.2.193"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "angr"; repo = "claripy"; diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 5f4c316f116d..fa07d7d0cd77 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -8,7 +8,6 @@ pefile, pyelftools, pytestCheckHook, - pythonOlder, pyvex, setuptools, sortedcontainers, @@ -32,8 +31,6 @@ buildPythonPackage rec { inherit version; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "angr"; repo = "cle"; diff --git a/pkgs/development/python-modules/cleanit/default.nix b/pkgs/development/python-modules/cleanit/default.nix index 931bc897bd7c..8e75a5d3c140 100644 --- a/pkgs/development/python-modules/cleanit/default.nix +++ b/pkgs/development/python-modules/cleanit/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build dependencies poetry-core, @@ -25,8 +24,6 @@ buildPythonPackage rec { version = "0.4.9"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "ratoaq2"; repo = "cleanit"; diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 0004a7baa5fa..602a1584d9b3 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -15,7 +15,6 @@ pytest-mock, pytestCheckHook, python-dateutil, - pythonOlder, setuptools, tabulate, }: diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index e73068f90685..8de827a9f176 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -6,10 +6,6 @@ # build-system flit-core, - # dependencies - pythonOlder, - typing-extensions, - # optional-dependencies azure-storage-blob, azure-storage-file-datalake, @@ -50,10 +46,6 @@ buildPythonPackage rec { build-system = [ flit-core ]; - dependencies = lib.optionals (pythonOlder "3.11") [ - typing-extensions - ]; - optional-dependencies = { all = optional-dependencies.azure ++ optional-dependencies.gs ++ optional-dependencies.s3; azure = [ diff --git a/pkgs/development/python-modules/configshell-fb/default.nix b/pkgs/development/python-modules/configshell-fb/default.nix index f8fd938781ed..29f81c7fa220 100644 --- a/pkgs/development/python-modules/configshell-fb/default.nix +++ b/pkgs/development/python-modules/configshell-fb/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - pythonOlder, hatchling, hatch-vcs, pyparsing, diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index 87fecf3b4c6b..fb56132d0425 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -27,8 +27,7 @@ let nativeBuildInputs = [ setuptools versioneer - ] - ++ versioneer.optional-dependencies.toml; + ]; # would create dependency loop with twisted doCheck = false; diff --git a/pkgs/development/python-modules/corallium/default.nix b/pkgs/development/python-modules/corallium/default.nix index 70713da7d733..0f3b69a06a22 100644 --- a/pkgs/development/python-modules/corallium/default.nix +++ b/pkgs/development/python-modules/corallium/default.nix @@ -29,9 +29,6 @@ buildPythonPackage rec { beartype pydantic rich - ] - ++ lib.optionals (python.pythonOlder "3.11") [ - tomli ]; meta = { diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index 4a6287b4b191..c42919f80a06 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -6,9 +6,7 @@ hypothesis, pytest-xdist, pytest7CheckHook, - pythonOlder, setuptools, - tomli, }: buildPythonPackage rec { @@ -25,12 +23,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - optional-dependencies = { - toml = lib.optionals (pythonOlder "3.11") [ - tomli - ]; - }; - nativeCheckInputs = [ flaky hypothesis diff --git a/pkgs/development/python-modules/ctypesgen/default.nix b/pkgs/development/python-modules/ctypesgen/default.nix index 768a02a46e55..b7893b007d6c 100644 --- a/pkgs/development/python-modules/ctypesgen/default.nix +++ b/pkgs/development/python-modules/ctypesgen/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools-scm, setuptools, toml, @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "1.1.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "ctypesgen"; repo = "ctypesgen"; diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index b3068cb5d040..639e648dabf0 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -10,10 +10,8 @@ # dependencies filelock, packaging, - tomli, distutils, - pythonOlder, ncurses, patchelf, dmgbuild, @@ -65,9 +63,6 @@ buildPythonPackage rec { packaging setuptools ] - ++ lib.optionals (pythonOlder "3.11") [ - tomli - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ dmgbuild ]; diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix index c67c9d8b5a16..8f093ae406a9 100644 --- a/pkgs/development/python-modules/dataclass-wizard/default.nix +++ b/pkgs/development/python-modules/dataclass-wizard/default.nix @@ -6,7 +6,6 @@ pytestCheckHook, python-dotenv, pythonAtLeast, - pythonOlder, pytimeparse, pyyaml, setuptools, diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index dc52efe7ac36..2acee398b154 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -37,9 +37,6 @@ distro, # win colorama, - # python-version-dependent - pythonOlder, - typing-extensions, # tests pytest-retry, pytest-xdist, @@ -95,8 +92,7 @@ buildPythonPackage (finalAttrs: { annexremote looseversion ] - ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] - ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]; downloaders = [ boto3 keyrings-alt diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix index fed1a487d2bb..730fc5c9cc75 100644 --- a/pkgs/development/python-modules/dendropy/default.nix +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, nix-update-script, setuptools, paup-cli, diff --git a/pkgs/development/python-modules/dicomweb-client/default.nix b/pkgs/development/python-modules/dicomweb-client/default.nix index 5faf8e97db99..fc9ed97a2582 100644 --- a/pkgs/development/python-modules/dicomweb-client/default.nix +++ b/pkgs/development/python-modules/dicomweb-client/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, hatchling, uv-dynamic-versioning, pytestCheckHook, diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 7a38cf70b885..8b443a689702 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -8,7 +8,6 @@ pytest-cov-stub, pytest-django, pytestCheckHook, - pythonOlder, hatchling, hatch-vcs, }: @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "0.19.19"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "deschler"; repo = "django-modeltranslation"; diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index f0060659ca75..575840c15ca3 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -10,8 +10,6 @@ pytest-mypy-plugins, oracledb, pytestCheckHook, - pythonOlder, - tomli, types-pytz, types-pyyaml, types-redis, @@ -38,8 +36,7 @@ buildPythonPackage rec { types-pytz types-pyyaml typing-extensions - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; optional-dependencies = { compatible-mypy = [ mypy ]; diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 09f0c930c4f9..8a912144d29f 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, poetry-core, charset-normalizer, diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index ccd7d204dcc6..9c798666f445 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -5,7 +5,6 @@ flit-core, pillow, python, - pythonOlder, }: # Note: this package is used to build LLVM’s documentation, which is part of the Darwin stdenv. diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix index 847974b5cbcf..e8f663ebc3af 100644 --- a/pkgs/development/python-modules/dparse/default.nix +++ b/pkgs/development/python-modules/dparse/default.nix @@ -1,11 +1,9 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, hatchling, packaging, - tomli, pyyaml, pytestCheckHook, }: @@ -24,7 +22,7 @@ buildPythonPackage rec { build-system = [ hatchling ]; - dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + dependencies = [ packaging ]; optional-dependencies = { # FIXME pipenv = [ pipenv ]; diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index a66e2050af80..ce4df410f095 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -24,7 +24,6 @@ psycopg2, pytest-django, pytestCheckHook, - pythonOlder, pyyaml, setuptools, uritemplate, diff --git a/pkgs/development/python-modules/dropmqttapi/default.nix b/pkgs/development/python-modules/dropmqttapi/default.nix index 4c9a92b78bf6..e5ce17029249 100644 --- a/pkgs/development/python-modules/dropmqttapi/default.nix +++ b/pkgs/development/python-modules/dropmqttapi/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "1.0.3"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "ChandlerSystems"; repo = "dropmqttapi"; diff --git a/pkgs/development/python-modules/easyenergy/default.nix b/pkgs/development/python-modules/easyenergy/default.nix index 16fed014475d..876a30e16942 100644 --- a/pkgs/development/python-modules/easyenergy/default.nix +++ b/pkgs/development/python-modules/easyenergy/default.nix @@ -9,7 +9,6 @@ pytest-cov-stub, pytest-freezer, pytestCheckHook, - pythonOlder, syrupy, yarl, }: @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "2.2.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-easyenergy"; diff --git a/pkgs/development/python-modules/edlib/default.nix b/pkgs/development/python-modules/edlib/default.nix index 2a464b1565b3..dc8a167e3020 100644 --- a/pkgs/development/python-modules/edlib/default.nix +++ b/pkgs/development/python-modules/edlib/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage, - pythonOlder, edlib, cython, python, diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix index 23bcc41fb4b5..17bd4da5b040 100644 --- a/pkgs/development/python-modules/eiswarnung/default.nix +++ b/pkgs/development/python-modules/eiswarnung/default.nix @@ -8,7 +8,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, pytz, yarl, }: @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-eiswarnung"; diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix index 8d437d7d54e9..780dcf69ad57 100644 --- a/pkgs/development/python-modules/elgato/default.nix +++ b/pkgs/development/python-modules/elgato/default.nix @@ -10,7 +10,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, yarl, }: @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "5.1.2"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "frenck"; repo = "python-elgato"; diff --git a/pkgs/development/python-modules/energyzero/default.nix b/pkgs/development/python-modules/energyzero/default.nix index dc946aa03f41..dee80614ff94 100644 --- a/pkgs/development/python-modules/energyzero/default.nix +++ b/pkgs/development/python-modules/energyzero/default.nix @@ -9,7 +9,6 @@ pytest-cov-stub, pytest-freezer, pytestCheckHook, - pythonOlder, syrupy, yarl, }: @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "5.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-energyzero"; diff --git a/pkgs/development/python-modules/entry-points-txt/default.nix b/pkgs/development/python-modules/entry-points-txt/default.nix index 0ead5fc63ee3..f0274f997831 100644 --- a/pkgs/development/python-modules/entry-points-txt/default.nix +++ b/pkgs/development/python-modules/entry-points-txt/default.nix @@ -1,6 +1,5 @@ { lib, - pythonOlder, pytestCheckHook, pytest-cov-stub, hatchling, diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index 5d1e75b7d830..b9e53f4471c5 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonAtLeast, - pythonOlder, # build-system setuptools, diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix index 813ff920dd76..fdca32ec44fe 100644 --- a/pkgs/development/python-modules/extension-helpers/default.nix +++ b/pkgs/development/python-modules/extension-helpers/default.nix @@ -7,10 +7,8 @@ findutils, pip, pytestCheckHook, - pythonOlder, setuptools-scm, setuptools, - tomli, wheel, }: @@ -31,7 +29,7 @@ buildPythonPackage rec { setuptools-scm ]; - dependencies = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + dependencies = [ setuptools ]; nativeCheckInputs = [ build diff --git a/pkgs/development/python-modules/fast-array-utils/default.nix b/pkgs/development/python-modules/fast-array-utils/default.nix index 4d3815c78c26..cbdbf12883c5 100644 --- a/pkgs/development/python-modules/fast-array-utils/default.nix +++ b/pkgs/development/python-modules/fast-array-utils/default.nix @@ -108,7 +108,6 @@ buildPythonPackage (finalAttrs: { pytest-doctestplus pytest-xdist ] - ++ coverage.optional-dependencies.toml ++ self.sparse ++ self.testing; testing = [ diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index a2534c60fdd0..c344a09d0c12 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -2,7 +2,6 @@ buildPythonPackage, cython, fetchFromGitHub, - isPy38, lib, lz4, numpy, @@ -60,9 +59,6 @@ buildPythonPackage rec { # 'CYTHON_MODULE'." Doesn't appear to be serious. See https://github.com/fastavro/fastavro/issues/112#issuecomment-387638676. disabledTests = [ "test_cython_python" ]; - # CLI tests are broken on Python 3.8. See https://github.com/fastavro/fastavro/issues/558. - disabledTestPaths = lib.optionals isPy38 [ "tests/test_main_cli.py" ]; - pythonImportsCheck = [ "fastavro" ]; meta = { diff --git a/pkgs/development/python-modules/findpython/default.nix b/pkgs/development/python-modules/findpython/default.nix index 8f093abaca8c..59a7383da442 100644 --- a/pkgs/development/python-modules/findpython/default.nix +++ b/pkgs/development/python-modules/findpython/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, # build time pdm-backend, diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix index 892b41adde05..e79c0d69677c 100644 --- a/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -5,7 +5,6 @@ attrs, flake8, pytestCheckHook, - pythonOlder, hypothesis, hypothesmith, setuptools, diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index d0912717ab72..0ce8626d7114 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -3,14 +3,12 @@ fetchFromGitHub, flit-core, lib, - pythonOlder, # dependencies flask, jinja2, markupsafe, werkzeug, wtforms, - typing-extensions, # optional dependencies # sqlalchemy flask-sqlalchemy, @@ -70,9 +68,6 @@ buildPythonPackage rec { markupsafe werkzeug wtforms - ] - ++ lib.optionals (pythonOlder "3.11") [ - typing-extensions ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/flit-scm/default.nix b/pkgs/development/python-modules/flit-scm/default.nix index 60eb80034910..fa5247de6baf 100644 --- a/pkgs/development/python-modules/flit-scm/default.nix +++ b/pkgs/development/python-modules/flit-scm/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchFromGitLab, - pythonOlder, flit-core, setuptools-scm, - tomli, }: buildPythonPackage rec { @@ -23,14 +21,12 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core setuptools-scm - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; propagatedBuildInputs = [ flit-core setuptools-scm - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; pythonImportsCheck = [ "flit_scm" ]; diff --git a/pkgs/development/python-modules/forecast-solar/default.nix b/pkgs/development/python-modules/forecast-solar/default.nix index 3c45f13453c3..4965722508e0 100644 --- a/pkgs/development/python-modules/forecast-solar/default.nix +++ b/pkgs/development/python-modules/forecast-solar/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, aiodns, aiohttp, aresponses, @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "4.2.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "forecast_solar"; diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix index d2212c275a26..4c2d82655349 100644 --- a/pkgs/development/python-modules/fyta-cli/default.nix +++ b/pkgs/development/python-modules/fyta-cli/default.nix @@ -8,7 +8,6 @@ mashumaro, pytest-asyncio, pytestCheckHook, - pythonOlder, syrupy, }: @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "0.7.2"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "dontinelli"; repo = "fyta_cli"; diff --git a/pkgs/development/python-modules/genie-partner-sdk/default.nix b/pkgs/development/python-modules/genie-partner-sdk/default.nix index 6d5eb32c95e8..6596ca006a4c 100644 --- a/pkgs/development/python-modules/genie-partner-sdk/default.nix +++ b/pkgs/development/python-modules/genie-partner-sdk/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, hatchling, aiohttp, fetchPypi, @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "1.0.11"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { inherit version; pname = "genie_partner_sdk"; diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index 8d4964880105..f63a3b036fe3 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -7,7 +7,6 @@ pytest-asyncio, pytest-httpx, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "0.9.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 587dd553f853..3f0012ed0a52 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -7,10 +7,8 @@ fetchPypi, pytestCheckHook, pythonAtLeast, - pythonOlder, pyyaml, setuptools, - tomli, }: buildPythonPackage rec { @@ -32,7 +30,6 @@ buildPythonPackage rec { ]; optional-dependencies = { - toml = lib.optionals (pythonOlder "3.11") [ tomli ]; yaml = [ pyyaml ]; }; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index aa836e2b478e..ce738191c2f6 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -12,7 +12,6 @@ protobuf, pytestCheckHook, pytest-asyncio, - pythonOlder, requests, setuptools, }: diff --git a/pkgs/development/python-modules/gotailwind/default.nix b/pkgs/development/python-modules/gotailwind/default.nix index ce90484d09bc..2b26bb0995a6 100644 --- a/pkgs/development/python-modules/gotailwind/default.nix +++ b/pkgs/development/python-modules/gotailwind/default.nix @@ -12,7 +12,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, syrupy, typer, yarl, @@ -24,8 +23,6 @@ buildPythonPackage rec { version = "0.3.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "frenck"; repo = "python-gotailwind"; diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix index 197c9246b085..1570fd1e254a 100644 --- a/pkgs/development/python-modules/gotenberg-client/default.nix +++ b/pkgs/development/python-modules/gotenberg-client/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, hatchling, httpx, - typing-extensions, }: buildPythonPackage rec { pname = "gotenberg-client"; @@ -24,7 +22,6 @@ buildPythonPackage rec { dependencies = [ httpx ] - ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ] ++ httpx.optional-dependencies.http2; # requires running gotenberg service diff --git a/pkgs/development/python-modules/gremlinpython/default.nix b/pkgs/development/python-modules/gremlinpython/default.nix index 370b702f14de..4464edfac965 100644 --- a/pkgs/development/python-modules/gremlinpython/default.nix +++ b/pkgs/development/python-modules/gremlinpython/default.nix @@ -8,7 +8,6 @@ isodate, nest-asyncio, pytestCheckHook, - pythonOlder, mock, pyhamcrest, pyyaml, diff --git a/pkgs/development/python-modules/gridnet/default.nix b/pkgs/development/python-modules/gridnet/default.nix index b53d9a7ba67d..6a784b868760 100644 --- a/pkgs/development/python-modules/gridnet/default.nix +++ b/pkgs/development/python-modules/gridnet/default.nix @@ -8,7 +8,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, yarl, }: @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "5.0.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-gridnet"; diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 80ab9e8bf0ae..45a25ac23b29 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -2,8 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - async-timeout, setuptools, }: @@ -25,10 +23,6 @@ buildPythonPackage rec { "async_timeout" ]; - dependencies = lib.optionals (pythonOlder "3.11") [ - async-timeout - ]; - # only manual tests doCheck = false; diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index 5cbd2f92221c..ada4eec695c2 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -15,7 +15,6 @@ pytest-codspeed, pytest-cov-stub, pytestCheckHook, - pythonOlder, setuptools, }: @@ -24,8 +23,6 @@ buildPythonPackage rec { version = "5.8.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "habluetooth"; diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index cbc65e8b9a47..770856ea976c 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -5,7 +5,6 @@ fetchPypi, flake8, pbr, - pythonOlder, setuptools, stestr, testscenarios, diff --git a/pkgs/development/python-modules/hakuin/default.nix b/pkgs/development/python-modules/hakuin/default.nix index a24ab9bf62a8..76e32ddec27a 100644 --- a/pkgs/development/python-modules/hakuin/default.nix +++ b/pkgs/development/python-modules/hakuin/default.nix @@ -6,7 +6,6 @@ hatchling, jinja2, nltk, - pythonOlder, }: buildPythonPackage rec { @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "0.2.2"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "pruzko"; repo = "hakuin"; diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index b9b23ac771e1..54e5514dc137 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -12,7 +12,6 @@ pytest-timeout, pytestCheckHook, pythonAtLeast, - pythonOlder, setuptools, zeroconf, }: 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 b25ec89a35f9..1c9db048ceb9 100644 --- a/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix +++ b/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix @@ -3,10 +3,8 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - pythonOlder, build, hatchling, - tomli, }: buildPythonPackage rec { @@ -24,8 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hatchling - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; nativeCheckInputs = [ build diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index 07ca89dc15f9..89b6d0e6c9ae 100644 --- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -5,9 +5,7 @@ hatchling, pytest-mock, pytestCheckHook, - tomli, twine, - pythonOlder, }: buildPythonPackage rec { @@ -30,8 +28,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook twine - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; disabledTests = [ # tests pip install, which unsurprisingly fails diff --git a/pkgs/development/python-modules/hatch-odoo/default.nix b/pkgs/development/python-modules/hatch-odoo/default.nix index 59f08ef09335..f11adc8c8513 100644 --- a/pkgs/development/python-modules/hatch-odoo/default.nix +++ b/pkgs/development/python-modules/hatch-odoo/default.nix @@ -5,8 +5,6 @@ hatchling, lib, manifestoo-core, - pythonOlder, - tomli, }: buildPythonPackage rec { pname = "hatch-odoo"; @@ -25,9 +23,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ hatchling manifestoo-core - ] - ++ lib.optionals (pythonOlder "3.11") [ - tomli ]; meta = { diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index d119bdf1169f..a6d6271f4df3 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -2,14 +2,12 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, # runtime editables, packaging, pathspec, pluggy, - tomli, trove-classifiers, # tests @@ -36,8 +34,7 @@ buildPythonPackage rec { pathspec pluggy trove-classifiers - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; pythonImportsCheck = [ "hatchling" diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index d1ea3bd04662..e3e97d5e5e2d 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system poetry-core, @@ -22,8 +21,6 @@ buildPythonPackage rec { version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "home-assistant-bluetooth"; diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix index d40e7f97ebc8..9fe4467205ff 100644 --- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix @@ -44,7 +44,6 @@ python, python-daemon, python-path, - pythonOlder, pyyaml, requests, setuptools, diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 36ff4ad8ac55..0c7db7a34750 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -37,8 +37,7 @@ buildPythonPackage rec { httpx httpcore python-socks - ] - ++ python-socks.optional-dependencies.asyncio; + ]; optional-dependencies = { asyncio = [ async-timeout ]; diff --git a/pkgs/development/python-modules/hy/default.nix b/pkgs/development/python-modules/hy/default.nix index 5e994c93ca33..fc66a397da43 100644 --- a/pkgs/development/python-modules/hy/default.nix +++ b/pkgs/development/python-modules/hy/default.nix @@ -7,7 +7,6 @@ hy, pytestCheckHook, python, - pythonOlder, setuptools, testers, }: diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix index 598bc780d788..90b53d2de96d 100644 --- a/pkgs/development/python-modules/hypercorn/default.nix +++ b/pkgs/development/python-modules/hypercorn/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, aioquic, h11, h2, @@ -22,8 +21,6 @@ buildPythonPackage rec { version = "0.18.0"; pyproject = true; - disabled = pythonOlder "3.11"; # missing taskgroup dependency - src = fetchFromGitHub { owner = "pgjones"; repo = "Hypercorn"; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 666ec35d18e6..6f7d3eb7588e 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -5,14 +5,12 @@ fetchFromGitHub, setuptools, attrs, - exceptiongroup, pexpect, doCheck ? true, pytestCheckHook, pytest-xdist, sortedcontainers, pythonAtLeast, - pythonOlder, tzdata, }: @@ -48,8 +46,7 @@ buildPythonPackage rec { dependencies = [ attrs sortedcontainers - ] - ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; + ]; nativeCheckInputs = [ pexpect diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index efd6b6dd758d..8c3a55bb1c50 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202602131"; + version = "0.1.202602151"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-52/atyFcRD9isvqVL2aIzSAB/U18aCKNJq9n/BZpDRw="; + hash = "sha256-u/CfbeZ4gb+tyomAA5fsXAY7qs5nOBDC8Vz5mNnWnho="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/idstools/default.nix b/pkgs/development/python-modules/idstools/default.nix index 54528caddb65..2aa3a41a3f0b 100644 --- a/pkgs/development/python-modules/idstools/default.nix +++ b/pkgs/development/python-modules/idstools/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pytestCheckHook, python-dateutil, - pythonOlder, setuptools, sphinx, sphinxcontrib-programoutput, @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "0.6.5"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "jasonish"; repo = "py-idstools"; diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 64824852961a..1a9c17922e11 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -3,7 +3,6 @@ stdenv, testers, buildPythonPackage, - pythonOlder, python, pytestCheckHook, # fetchers diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index eb28003c170a..c9699aa9cca4 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -4,8 +4,6 @@ hatchling, lib, packaging, - pythonOlder, - tomli, twisted, }: @@ -24,7 +22,7 @@ let build-system = [ hatchling ]; - dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + dependencies = [ packaging ]; # escape infinite recursion with twisted doCheck = false; diff --git a/pkgs/development/python-modules/inequality/default.nix b/pkgs/development/python-modules/inequality/default.nix index 80fc679f5b6a..8f09bdeebe40 100644 --- a/pkgs/development/python-modules/inequality/default.nix +++ b/pkgs/development/python-modules/inequality/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, libpysal, mapclassify, @@ -18,7 +17,6 @@ buildPythonPackage rec { pname = "inequality"; version = "1.1.2"; pyproject = true; - disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "pysal"; diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix index 3e71aaf64a35..bf4272905afb 100644 --- a/pkgs/development/python-modules/inline-snapshot/default.nix +++ b/pkgs/development/python-modules/inline-snapshot/default.nix @@ -15,7 +15,6 @@ pytest-mock, pytest-xdist, pytestCheckHook, - pythonOlder, rich, time-machine, toml, @@ -40,9 +39,6 @@ buildPythonPackage rec { executing rich toml - ] - ++ lib.optionals (pythonOlder "3.11") [ - toml ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix index 79a7d9e1913b..76988306ffbc 100644 --- a/pkgs/development/python-modules/instructor/default.nix +++ b/pkgs/development/python-modules/instructor/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system hatchling, diff --git a/pkgs/development/python-modules/intensity-normalization/default.nix b/pkgs/development/python-modules/intensity-normalization/default.nix index 686d27bfe575..dcc802fd5051 100644 --- a/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/pkgs/development/python-modules/intensity-normalization/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, pytestCheckHook, pytest-cov-stub, hatchling, @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "3.0.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { pname = "intensity_normalization"; inherit version; diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index af764033e1d5..aa920e42c15d 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -3,12 +3,9 @@ buildPythonPackage, fetchPypi, pythonAtLeast, - pythonOlder, decorator, ipython, isPyPy, - exceptiongroup, - tomli, setuptools, pytestCheckHook, pytest-timeout, @@ -31,10 +28,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipython decorator - ] - ++ lib.optionals (pythonOlder "3.11") [ - exceptiongroup - tomli ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix index b0bc7cdce087..a10601ef75cf 100644 --- a/pkgs/development/python-modules/itemadapter/default.nix +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -5,7 +5,6 @@ fetchPypi, hatchling, pydantic, - pythonOlder, scrapy, }: diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index b66d5e8d7abf..31d38872be86 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -3,9 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitLab, - pythonOlder, flit-core, - async-timeout, dbus, pytest, pytest-trio, @@ -35,9 +33,6 @@ buildPythonPackage rec { pytest-asyncio testpath trio - ] - ++ lib.optionals (pythonOlder "3.11") [ - async-timeout ]; checkPhase = '' diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index e442e9d87f9d..44e5a50d1bd1 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -4,7 +4,6 @@ cargo, fetchFromGitHub, pytestCheckHook, - pythonOlder, rustc, rustPlatform, unicodecsv, @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "1.2.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "jamesturk"; repo = "jellyfish"; diff --git a/pkgs/development/python-modules/jsonconversion/default.nix b/pkgs/development/python-modules/jsonconversion/default.nix index 31187551459b..be1040d97b23 100644 --- a/pkgs/development/python-modules/jsonconversion/default.nix +++ b/pkgs/development/python-modules/jsonconversion/default.nix @@ -6,7 +6,6 @@ pdm-backend, pytestCheckHook, pythonAtLeast, - pythonOlder, setuptools, }: @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "1.2.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "DLR-RM"; repo = "python-jsonconversion"; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 9541f04170a6..ac36656e0dce 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -17,10 +17,8 @@ notebook-shim, packaging, setuptools, - tomli, tornado, traitlets, - pythonOlder, }: buildPythonPackage rec { @@ -73,8 +71,7 @@ buildPythonPackage rec { setuptools tornado traitlets - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; makeWrapperArgs = [ "--set" diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 92914b644286..c4fc55b2bd62 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -17,8 +17,6 @@ nbformat, packaging, pyyaml, - pythonOlder, - tomli, # tests addBinToPathHook, @@ -85,8 +83,7 @@ buildPythonPackage rec { nbformat packaging pyyaml - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; nativeCheckInputs = [ addBinToPathHook diff --git a/pkgs/development/python-modules/keba-kecontact/default.nix b/pkgs/development/python-modules/keba-kecontact/default.nix index 94e1c74fdf2d..d6ffd64a2194 100644 --- a/pkgs/development/python-modules/keba-kecontact/default.nix +++ b/pkgs/development/python-modules/keba-kecontact/default.nix @@ -6,7 +6,6 @@ hatchling, ifaddr, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "4.3.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "dannerph"; repo = "keba-kecontact"; diff --git a/pkgs/development/python-modules/knocki/default.nix b/pkgs/development/python-modules/knocki/default.nix index 4ed68700afc5..6073ba2b48c4 100644 --- a/pkgs/development/python-modules/knocki/default.nix +++ b/pkgs/development/python-modules/knocki/default.nix @@ -7,7 +7,6 @@ mashumaro, orjson, poetry-core, - pythonOlder, pytestCheckHook, pytest-aiohttp, pytest-cov-stub, @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "0.4.2"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "swan-solutions"; repo = "knocki-homeassistant"; diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 1ed8f6bb91cf..fd787acd71cb 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -1,6 +1,5 @@ { lib, - async-timeout, buildPythonPackage, defang, dnspython, @@ -9,7 +8,6 @@ playwrightcapture, poetry-core, pydantic, - pythonOlder, redis, requests, ua-parser, @@ -49,8 +47,7 @@ buildPythonPackage rec { ] ++ playwrightcapture.optional-dependencies.recaptcha ++ redis.optional-dependencies.hiredis - ++ ua-parser.optional-dependencies.regex - ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; + ++ ua-parser.optional-dependencies.regex; # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/leaone-ble/default.nix b/pkgs/development/python-modules/leaone-ble/default.nix index dbd505950bcc..3be90e6502fa 100644 --- a/pkgs/development/python-modules/leaone-ble/default.nix +++ b/pkgs/development/python-modules/leaone-ble/default.nix @@ -8,7 +8,6 @@ poetry-core, pytest-cov-stub, pytestCheckHook, - pythonOlder, sensor-state-data, }: @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "leaone-ble"; diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix index ef0d4d160303..bac9dc029567 100644 --- a/pkgs/development/python-modules/led-ble/default.nix +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -8,7 +8,6 @@ poetry-core, pytest-cov-stub, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "1.1.7"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "led-ble"; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 671198862028..027ee4cae84e 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, python, - pythonOlder, fetchFromGitHub, cmake, sip4, diff --git a/pkgs/development/python-modules/lifelines/default.nix b/pkgs/development/python-modules/lifelines/default.nix index f7c2cc852471..26b13d4b2ee4 100644 --- a/pkgs/development/python-modules/lifelines/default.nix +++ b/pkgs/development/python-modules/lifelines/default.nix @@ -13,7 +13,6 @@ pandas, psutil, pytestCheckHook, - pythonOlder, scikit-learn, scipy, setuptools, diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix index c5468e91a754..f5be74561e70 100644 --- a/pkgs/development/python-modules/lomond/default.nix +++ b/pkgs/development/python-modules/lomond/default.nix @@ -3,7 +3,6 @@ fetchFromGitHub, lib, pythonAtLeast, - pythonOlder, # runtime six, diff --git a/pkgs/development/python-modules/macholib/default.nix b/pkgs/development/python-modules/macholib/default.nix index 7efe8a3d717a..4f19dfdc8e3a 100644 --- a/pkgs/development/python-modules/macholib/default.nix +++ b/pkgs/development/python-modules/macholib/default.nix @@ -3,11 +3,9 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, unittestCheckHook, altgraph, setuptools, - typing-extensions, pyinstaller, }: @@ -27,9 +25,6 @@ buildPythonPackage rec { dependencies = [ altgraph - ] - ++ lib.optionals (pythonOlder "3.11") [ - typing-extensions ]; # Checks assume to find darwin specific libraries diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 8807a2a71940..4a5463ee2faa 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchpatch2, fetchPypi, - pythonOlder, # build-system uv-build, @@ -24,7 +23,6 @@ ruff, starlette, tomlkit, - typing-extensions, uvicorn, websockets, @@ -72,8 +70,7 @@ buildPythonPackage rec { tomlkit uvicorn websockets - ] - ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + ]; pythonImportsCheck = [ "marimo" ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index e530dbcd7a88..a76693c0b793 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -3,15 +3,10 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system flit-core, - # dependencies - backports-datetime-fromisoformat, - typing-extensions, - # tests pytestCheckHook, simplejson, @@ -31,11 +26,6 @@ buildPythonPackage rec { build-system = [ flit-core ]; - dependencies = lib.optionals (pythonOlder "3.11") [ - backports-datetime-fromisoformat - typing-extensions - ]; - nativeCheckInputs = [ pytestCheckHook simplejson diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index fec7525ca49d..2a490f7d6e2c 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -8,10 +8,8 @@ pendulum, pytest-mock, pytestCheckHook, - pythonOlder, pyyaml, setuptools, - tomli, tomli-w, typing-extensions, }: @@ -36,7 +34,7 @@ buildPythonPackage rec { orjson = [ orjson ]; msgpack = [ msgpack ]; yaml = [ pyyaml ]; - toml = [ tomli-w ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + toml = [ tomli-w ]; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 7155cab7c5ae..35e9e0c350b4 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -4,13 +4,11 @@ buildPythonPackage, fetchPypi, fetchpatch, - pythonOlder, # build-system, dependencies meson, ninja, pyproject-metadata, - tomli, # tests cmake, @@ -35,15 +33,13 @@ buildPythonPackage rec { meson ninja pyproject-metadata - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; dependencies = [ meson ninja pyproject-metadata - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; nativeCheckInputs = [ cmake diff --git a/pkgs/development/python-modules/meteoswiss-async/default.nix b/pkgs/development/python-modules/meteoswiss-async/default.nix index f52736c52568..da875e91208f 100644 --- a/pkgs/development/python-modules/meteoswiss-async/default.nix +++ b/pkgs/development/python-modules/meteoswiss-async/default.nix @@ -8,7 +8,6 @@ pytest-cov-stub, pytest-mock, pytestCheckHook, - pythonOlder, setuptools, }: @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "0.1.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "albertomontesg"; repo = "meteoswiss-async"; diff --git a/pkgs/development/python-modules/misaki/default.nix b/pkgs/development/python-modules/misaki/default.nix index d4a65f30e26b..4a11832b131a 100644 --- a/pkgs/development/python-modules/misaki/default.nix +++ b/pkgs/development/python-modules/misaki/default.nix @@ -16,7 +16,6 @@ phonemizer, pip, pypinyin, - pythonOlder, regex, replaceVars, spacy-curated-transformers, diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index e3cfab3d3d67..a130857e1a71 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -3,9 +3,7 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, setuptools, - typing-extensions, }: buildPythonPackage rec { @@ -20,10 +18,6 @@ buildPythonPackage rec { hash = "sha256-rUEZNVuMT5+GsMakrkK6rshKSKtTTN72kK92AmQ8bl8="; }; - dependencies = lib.optionals (pythonOlder "3.11") [ - typing-extensions - ]; - build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix index cfb577a75aa2..9745d865e24a 100644 --- a/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix +++ b/pkgs/development/python-modules/mkdocs-awesome-nav/default.nix @@ -10,7 +10,6 @@ natsort, pydantic, pytestCheckHook, - pythonOlder, wcmatch, }: diff --git a/pkgs/development/python-modules/momepy/default.nix b/pkgs/development/python-modules/momepy/default.nix index 62ef5a5902f0..f024c7ae5372 100644 --- a/pkgs/development/python-modules/momepy/default.nix +++ b/pkgs/development/python-modules/momepy/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, geopandas, inequality, @@ -21,7 +20,6 @@ buildPythonPackage rec { pname = "momepy"; version = "0.11.0"; pyproject = true; - disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "pysal"; diff --git a/pkgs/development/python-modules/monai-deploy/default.nix b/pkgs/development/python-modules/monai-deploy/default.nix index f3b5d6657ae2..a32d6ae8918a 100644 --- a/pkgs/development/python-modules/monai-deploy/default.nix +++ b/pkgs/development/python-modules/monai-deploy/default.nix @@ -7,7 +7,6 @@ numpy, pytest-lazy-fixture, pytestCheckHook, - pythonOlder, setuptools, tritonclient, typeguard, diff --git a/pkgs/development/python-modules/monai/default.nix b/pkgs/development/python-modules/monai/default.nix index 6bc4d44b9621..e13ec4ca0b37 100644 --- a/pkgs/development/python-modules/monai/default.nix +++ b/pkgs/development/python-modules/monai/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, ninja, numpy, packaging, diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 62d75ff1d667..2120bed89958 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, attrs, coverage, furo, @@ -18,7 +17,6 @@ sphinx, sphinx-copybutton, sphinx-design, - tomli, tomli-w, }: @@ -66,10 +64,7 @@ buildPythonPackage rec { ] ++ optional-dependencies.yaml ++ optional-dependencies.toml; - toml = [ - tomli-w - ] - ++ lib.optional (pythonOlder "3.11") tomli; + toml = [ tomli-w ]; yaml = [ pyyaml ]; }; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 7d2bc408541d..52005f32ac10 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -8,9 +8,7 @@ pytestCheckHook, pytest-codspeed, pytest-cov-stub, - pythonOlder, setuptools, - typing-extensions, }: buildPythonPackage rec { @@ -33,10 +31,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = lib.optionals (pythonOlder "3.11") [ - typing-extensions - ]; - env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument"; }; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index d2220f235b6a..e3cbdc382901 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -6,7 +6,6 @@ fetchpatch, gitUpdater, pythonAtLeast, - pythonOlder, isPyPy, # build-system @@ -66,8 +65,7 @@ buildPythonPackage rec { mypy-extensions pathspec typing-extensions - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; optional-dependencies = { dmypy = [ psutil ]; diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix index 00a70ad03454..47970169b677 100644 --- a/pkgs/development/python-modules/napari-npe2/default.nix +++ b/pkgs/development/python-modules/napari-npe2/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system hatchling, @@ -18,8 +17,6 @@ rich, tomli-w, typer, - # python<3.11 only - tomli, # tests imagemagick, @@ -61,9 +58,6 @@ buildPythonPackage (finalAttrs: { rich tomli-w typer - ] - ++ lib.optionals (pythonOlder "3.11") [ - tomli ]; pythonImportsCheck = [ "npe2" ]; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 8817d524e4ee..804ba43b9d95 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -5,7 +5,6 @@ numpy, pandas, pyarrow, - pythonOlder, pytz, setuptools, }: diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index 15078af0a068..541553419422 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -14,8 +14,6 @@ pandas, plotly, scikit-learn, - pythonOlder, - tomli, # tests pytestCheckHook, @@ -49,8 +47,7 @@ buildPythonPackage rec { pandas plotly scikit-learn - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Prevents 'Fatal Python error: Aborted' on darwin during checkPhase diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 8a656cf0c78d..0552ca8896e6 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchPypi, - pythonOlder, # python dependencies click, python-dateutil, diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix index b84f1d47b852..70290ed9a5ca 100644 --- a/pkgs/development/python-modules/notus-scanner/default.nix +++ b/pkgs/development/python-modules/notus-scanner/default.nix @@ -7,9 +7,7 @@ psutil, pytestCheckHook, python-gnupg, - pythonOlder, sentry-sdk, - tomli, }: buildPythonPackage rec { @@ -37,8 +35,7 @@ buildPythonPackage rec { psutil python-gnupg sentry-sdk - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index c59f6ae26b00..706868312c06 100644 --- a/pkgs/development/python-modules/nox/default.nix +++ b/pkgs/development/python-modules/nox/default.nix @@ -51,9 +51,6 @@ buildPythonPackage rec { humanize packaging virtualenv - ] - ++ lib.optionals (pythonOlder "3.11") [ - tomli ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index c04b2775f8eb..681b659d3f01 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -4,7 +4,6 @@ fetchFromGitHub, python, pythonAtLeast, - pythonOlder, buildPythonPackage, writeTextFile, @@ -39,8 +38,6 @@ buildPythonPackage (finalAttrs: { version = "2.4.2"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "numpy"; repo = "numpy"; diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index 72b85f9558f4..77f0fbf89911 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -18,7 +18,6 @@ pythonOlder, setuptools, structlog, - tomli, tornado, zstandard, }: @@ -49,8 +48,7 @@ buildPythonPackage rec { platformdirs tornado pycurl - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; optional-dependencies = { # vercmp = [ pyalpm ]; diff --git a/pkgs/development/python-modules/nvidia-dlprof-pytorch-nvtx/default.nix b/pkgs/development/python-modules/nvidia-dlprof-pytorch-nvtx/default.nix index 72b9bdb5072e..1b3e9b93f0dd 100644 --- a/pkgs/development/python-modules/nvidia-dlprof-pytorch-nvtx/default.nix +++ b/pkgs/development/python-modules/nvidia-dlprof-pytorch-nvtx/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchurl, - pythonOlder, numpy, torch, }: diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix index 984862d5e65a..0f43639f4f20 100644 --- a/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -5,7 +5,6 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - pythonOlder, pytest-asyncio, pytestCheckHook, pytz, @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "6.1.2"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-odp-amsterdam"; diff --git a/pkgs/development/python-modules/omnikinverter/default.nix b/pkgs/development/python-modules/omnikinverter/default.nix index a2114a4ba10e..3fe0a3d9d5c3 100644 --- a/pkgs/development/python-modules/omnikinverter/default.nix +++ b/pkgs/development/python-modules/omnikinverter/default.nix @@ -8,7 +8,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, yarl, }: @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-omnikinverter"; diff --git a/pkgs/development/python-modules/open-meteo/default.nix b/pkgs/development/python-modules/open-meteo/default.nix index 4d4ab4b21b1d..562433ab6272 100644 --- a/pkgs/development/python-modules/open-meteo/default.nix +++ b/pkgs/development/python-modules/open-meteo/default.nix @@ -10,7 +10,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "0.4.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "frenck"; repo = "python-open-meteo"; diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix index 50044a66b6a9..2aa4e74aed37 100644 --- a/pkgs/development/python-modules/openwebifpy/default.nix +++ b/pkgs/development/python-modules/openwebifpy/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, # build-system hatchling, @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "4.3.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { inherit pname version; hash = "sha256-FaynJT+bR63nIwLEwXjTjwPXZ3Q5/X+zpx0gTA3Pqo8="; diff --git a/pkgs/development/python-modules/optype/default.nix b/pkgs/development/python-modules/optype/default.nix index 6daaed2bcb73..96b42b3cea20 100644 --- a/pkgs/development/python-modules/optype/default.nix +++ b/pkgs/development/python-modules/optype/default.nix @@ -8,7 +8,6 @@ numpy-typing-compat, beartype, pytestCheckHook, - pythonOlder, }: buildPythonPackage (finalAttrs: { @@ -16,8 +15,6 @@ buildPythonPackage (finalAttrs: { version = "0.15.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "jorenham"; repo = "optype"; diff --git a/pkgs/development/python-modules/p1monitor/default.nix b/pkgs/development/python-modules/p1monitor/default.nix index b737908c1797..9779c0f5cb07 100644 --- a/pkgs/development/python-modules/p1monitor/default.nix +++ b/pkgs/development/python-modules/p1monitor/default.nix @@ -9,7 +9,6 @@ pytest-cov-stub, pytestCheckHook, syrupy, - pythonOlder, yarl, }: @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "3.2.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-p1monitor"; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index c14031a20e21..947122608e8c 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -97,8 +97,7 @@ let pkg-config versioneer wheel - ] - ++ versioneer.optional-dependencies.toml; + ]; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index d604adcf6162..ec04a946e276 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, pytestCheckHook, setuptools, }: diff --git a/pkgs/development/python-modules/pdm-build-locked/default.nix b/pkgs/development/python-modules/pdm-build-locked/default.nix index dc7945ac7472..669d95db81af 100644 --- a/pkgs/development/python-modules/pdm-build-locked/default.nix +++ b/pkgs/development/python-modules/pdm-build-locked/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, pdm-backend, - tomli, build, hatchling, pkginfo, @@ -31,8 +29,6 @@ buildPythonPackage rec { build-system = [ pdm-backend ]; - dependencies = lib.optionals (pythonOlder "3.11") [ tomli ]; - pythonImportsCheck = [ "pdm_build_locked" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index f59df6139a9e..f440f0b626c6 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -9,7 +9,6 @@ gwcs, matplotlib, numpy, - pythonOlder, rasterio, scikit-image, scikit-learn, @@ -26,8 +25,6 @@ buildPythonPackage rec { version = "2.3.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "astropy"; repo = "photutils"; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 73c8e6cbfb5b..d9ced756487e 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -9,10 +9,8 @@ pyproject-hooks, pytest-xdist, pytestCheckHook, - pythonOlder, setuptools, setuptools-scm, - tomli, tomli-w, wheel, }: @@ -42,8 +40,7 @@ buildPythonPackage rec { pyproject-hooks setuptools wheel - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index c67167f8f2ba..e9466f46a184 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -9,8 +9,6 @@ packaging, platformdirs, pytestCheckHook, - pythonOlder, - tomli, userpath, git, }: @@ -37,8 +35,7 @@ buildPythonPackage rec { packaging platformdirs userpath - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/python-modules/pixel-font-builder/default.nix b/pkgs/development/python-modules/pixel-font-builder/default.nix index e8f3c57a1b94..b4882e65a6b7 100644 --- a/pkgs/development/python-modules/pixel-font-builder/default.nix +++ b/pkgs/development/python-modules/pixel-font-builder/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, pytestCheckHook, nix-update-script, hatchling, @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "0.0.47"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { pname = "pixel_font_builder"; inherit version; diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index 4a6731459eb1..c807817a0576 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, docutils, fetchPypi, - pythonOlder, importlib-metadata, importlib-resources, setuptools, @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "2.0.12"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { pname = "pkg_about"; inherit version; diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 0abc7153e8e8..fd0cc9667c0d 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -7,7 +7,6 @@ hatchling, pytest-mock, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index 7dcd0c97c734..ab013cd8caee 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, fixtures, pytestCheckHook, - pythonOlder, requests, requests-mock, rich, diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index a846223148d0..aa4d247b2922 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -5,10 +5,8 @@ fetchFromGitHub, gitMinimal, pytestCheckHook, - pythonOlder, ruamel-yaml, setuptools, - tomli, }: buildPythonPackage rec { @@ -25,7 +23,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ ruamel-yaml ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + dependencies = [ ruamel-yaml ]; nativeCheckInputs = [ gitMinimal diff --git a/pkgs/development/python-modules/prisma/default.nix b/pkgs/development/python-modules/prisma/default.nix index 15ba349a04ed..8cbe2e3afffd 100644 --- a/pkgs/development/python-modules/prisma/default.nix +++ b/pkgs/development/python-modules/prisma/default.nix @@ -8,9 +8,7 @@ nodeenv, pydantic, python-dotenv, - pythonOlder, setuptools, - strenum, tomlkit, typing-extensions, }: @@ -38,8 +36,7 @@ buildPythonPackage rec { python-dotenv tomlkit typing-extensions - ] - ++ lib.optionals (pythonOlder "3.11") [ strenum ]; + ]; # Building the client requires network access doCheck = false; diff --git a/pkgs/development/python-modules/propcache/default.nix b/pkgs/development/python-modules/propcache/default.nix index 6402596f8333..d7d7db06793c 100644 --- a/pkgs/development/python-modules/propcache/default.nix +++ b/pkgs/development/python-modules/propcache/default.nix @@ -8,9 +8,7 @@ pytest-cov-stub, pytest-xdist, pytestCheckHook, - pythonOlder, setuptools, - tomli, }: buildPythonPackage rec { @@ -18,8 +16,6 @@ buildPythonPackage rec { version = "0.4.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "aio-libs"; repo = "propcache"; @@ -36,9 +32,6 @@ buildPythonPackage rec { cython expandvars setuptools - ] - ++ lib.optionals (pythonOlder "3.11") [ - tomli ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 91b8f29d7e92..f877a8cd4e67 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, fetchurl, - pythonOlder, replaceVars, # build @@ -16,7 +15,6 @@ # psycopg-c cython, - tomli, # docs furo, @@ -76,9 +74,6 @@ let build-system = [ cython setuptools - ] - ++ lib.optional (pythonOlder "3.11") [ - tomli ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pueblo/default.nix b/pkgs/development/python-modules/pueblo/default.nix index 6f5c97680fe4..202976b7d992 100644 --- a/pkgs/development/python-modules/pueblo/default.nix +++ b/pkgs/development/python-modules/pueblo/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, setuptools, versioningit, @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "0.0.15"; pyproject = true; - disabled = pythonOlder "3.11"; - # This tarball doesn't include tests unfortunately, and the GitHub tarball # could have been an alternative, but versioningit fails to detect the # version of it correctly, even with setuptools-scm and diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix index c8927b9b19b3..62b3a7d5eab4 100644 --- a/pkgs/development/python-modules/pvo/default.nix +++ b/pkgs/development/python-modules/pvo/default.nix @@ -9,7 +9,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, syrupy, yarl, }: @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "2.2.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "frenck"; repo = "python-pvoutput"; diff --git a/pkgs/development/python-modules/py-libnuma/default.nix b/pkgs/development/python-modules/py-libnuma/default.nix index 90310b81b4c3..dce6b1905773 100644 --- a/pkgs/development/python-modules/py-libnuma/default.nix +++ b/pkgs/development/python-modules/py-libnuma/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, numactl, }: diff --git a/pkgs/development/python-modules/pyasynchat/default.nix b/pkgs/development/python-modules/pyasynchat/default.nix index acc707492916..409cf37d9a0f 100644 --- a/pkgs/development/python-modules/pyasynchat/default.nix +++ b/pkgs/development/python-modules/pyasynchat/default.nix @@ -5,7 +5,6 @@ setuptools, pyasyncore, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -30,16 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - preCheck = - if (pythonOlder "3.11") then - '' - substituteInPlace tests/test_asynchat.py \ - --replace-fail "asynchat = warnings_helper.import_deprecated('asynchat')" 'import asynchat' \ - --replace-fail "asyncore = warnings_helper.import_deprecated('asyncore')" 'import asyncore' \ - --replace-fail 'support.requires_working_socket(module=True)' "" - '' - else - null; + preCheck = null; pythonImportsCheck = [ "asynchat" diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 6d13ac9859b7..0d8a31ad0d79 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -8,7 +8,6 @@ pytest-asyncio, pytest-mock, pytestCheckHook, - pythonOlder, requests, requests-oauthlib, requests-mock, @@ -21,8 +20,6 @@ buildPythonPackage rec { version = "9.2.3"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "jabesq"; repo = "pyatmo"; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index f885c209492a..6adaa0bc65fc 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -43,8 +43,7 @@ buildPythonPackage rec { build-system = [ setuptools versioneer - ] - ++ versioneer.optional-dependencies.toml; + ]; dependencies = [ bids-validator diff --git a/pkgs/development/python-modules/pycfdns/default.nix b/pkgs/development/python-modules/pycfdns/default.nix index a9c5627d4d5d..3ad4b1c12ed1 100644 --- a/pkgs/development/python-modules/pycfdns/default.nix +++ b/pkgs/development/python-modules/pycfdns/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - pythonOlder, }: buildPythonPackage rec { @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "3.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "ludeeus"; repo = "pycfdns"; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index c44a2d3c5461..f9f8bb47b0bd 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, casttube, fetchFromGitHub, - pythonOlder, protobuf, setuptools, zeroconf, @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "14.0.9"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "pychromecast"; diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 01f3033dd36c..789fed9ec6e2 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -8,8 +8,6 @@ # dependencies anyio, - pythonOlder, - exceptiongroup, # tests objsize, @@ -43,7 +41,7 @@ buildPythonPackage (finalAttrs: { rustPlatform.maturinBuildHook ]; - dependencies = [ anyio ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; + dependencies = [ anyio ]; pythonImportsCheck = [ "pycrdt" ]; diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index 073bd963bca6..292c43d00a4b 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -8,7 +8,6 @@ netifaces, pytest-asyncio, pytestCheckHook, - pythonOlder, urllib3, setuptools, tenacity, @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "2.18.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "fredrike"; repo = "pydaikin"; diff --git a/pkgs/development/python-modules/pydeako/default.nix b/pkgs/development/python-modules/pydeako/default.nix index b272f1c7c7e1..8b8f632e0b7c 100644 --- a/pkgs/development/python-modules/pydeako/default.nix +++ b/pkgs/development/python-modules/pydeako/default.nix @@ -5,7 +5,6 @@ mock, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, zeroconf, }: @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "0.6.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "DeakoLights"; repo = "pydeako"; diff --git a/pkgs/development/python-modules/pydiscovergy/default.nix b/pkgs/development/python-modules/pydiscovergy/default.nix index eeda31a4a536..af1a140222c7 100644 --- a/pkgs/development/python-modules/pydiscovergy/default.nix +++ b/pkgs/development/python-modules/pydiscovergy/default.nix @@ -11,7 +11,6 @@ pytest-httpx, poetry-core, pytestCheckHook, - pythonOlder, respx, }: @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "3.1.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "jpbede"; repo = "pydiscovergy"; diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index 6fe939ff927d..ae631517be94 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, fetchpatch2, poetry-core, @@ -38,7 +37,7 @@ buildPythonPackage rec { --replace 'version = "0.0.0-dev"' 'version = "${version}"' ''; - propagatedBuildInputs = [ snowballstemmer ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + propagatedBuildInputs = [ snowballstemmer ]; optional-dependencies.toml = [ tomli ]; diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index 87be70bd1ae9..06de33708cb2 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -10,7 +10,6 @@ graphql-core, pytest-asyncio, pytestCheckHook, - pythonOlder, requests, setuptools, setuptools-scm, @@ -21,8 +20,6 @@ buildPythonPackage rec { version = "2025.9.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "dknowles2"; repo = "pydrawise"; diff --git a/pkgs/development/python-modules/pyecotrend-ista/default.nix b/pkgs/development/python-modules/pyecotrend-ista/default.nix index 02db06776127..c281eb080388 100644 --- a/pkgs/development/python-modules/pyecotrend-ista/default.nix +++ b/pkgs/development/python-modules/pyecotrend-ista/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, setuptools-scm, dataclasses-json, @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "3.5.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "Ludy87"; repo = "pyecotrend-ista"; diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index c3552daa7e20..94d10ee0aa75 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -9,7 +9,6 @@ # tests pytestCheckHook, wcag-contrast-ratio, - pythonOlder, }: let diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 62ef21d8a46f..4266d6f60096 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -16,9 +16,7 @@ pytest-testinfra, pytestCheckHook, python-dateutil, - pythonOlder, typeguard, - typing-extensions, uv-dynamic-versioning, }: @@ -63,8 +61,7 @@ buildPythonPackage rec { pydantic python-dateutil typeguard - ] - ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + ]; nativeCheckInputs = [ freezegun diff --git a/pkgs/development/python-modules/pyipma/default.nix b/pkgs/development/python-modules/pyipma/default.nix index 407e80d4710b..628254991592 100644 --- a/pkgs/development/python-modules/pyipma/default.nix +++ b/pkgs/development/python-modules/pyipma/default.nix @@ -9,7 +9,6 @@ geopy, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, }: @@ -18,8 +17,6 @@ buildPythonPackage rec { version = "3.0.9"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "dgomes"; repo = "pyipma"; diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index b8e72303e60d..47ddb9033b3f 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -2,7 +2,6 @@ lib, aiohttp, aresponses, - async-timeout, awesomeversion, backoff, buildPythonPackage, @@ -12,7 +11,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, syrupy, yarl, }: @@ -42,8 +40,7 @@ buildPythonPackage rec { backoff deepmerge yarl - ] - ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; + ]; nativeCheckInputs = [ aresponses diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 3d74dbf3f918..35954461182e 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, hatchling, pydantic, diff --git a/pkgs/development/python-modules/pylaunches/default.nix b/pkgs/development/python-modules/pylaunches/default.nix index cac5fd54914c..96d739a9a48a 100644 --- a/pkgs/development/python-modules/pylaunches/default.nix +++ b/pkgs/development/python-modules/pylaunches/default.nix @@ -7,7 +7,6 @@ poetry-core, pytestCheckHook, pytest-asyncio, - pythonOlder, }: buildPythonPackage rec { @@ -15,8 +14,6 @@ buildPythonPackage rec { version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "ludeeus"; repo = "pylaunches"; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 6f018ebd3939..99bcf2293409 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -14,10 +14,8 @@ pytest-xdist, pytest7CheckHook, pythonAtLeast, - pythonOlder, requests, setuptools, - tomli, tomlkit, typing-extensions, writableTmpDirAsHomeHook, @@ -44,8 +42,7 @@ buildPythonPackage (finalAttrs: { mccabe platformdirs tomlkit - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; nativeCheckInputs = [ gitpython diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index ca6c4ad055d0..6df0b94614f9 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -11,7 +10,6 @@ mypy, pytestCheckHook, python-lsp-server, - tomli, }: buildPythonPackage rec { @@ -31,8 +29,7 @@ buildPythonPackage rec { dependencies = [ mypy python-lsp-server - ] - ++ lib.optional (pythonOlder "3.11") tomli; + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 8a6212b1745c..69b15906de54 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -1,6 +1,5 @@ { lib, - async-timeout, buildPythonPackage, click, cryptography, @@ -10,7 +9,6 @@ pytest-asyncio, pytest-timeout, pytestCheckHook, - pythonOlder, xdg, zeroconf, }: @@ -32,8 +30,7 @@ buildPythonPackage rec { dependencies = [ cryptography orjson - ] - ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; + ]; optional-dependencies = { cli = [ @@ -47,8 +44,7 @@ buildPythonPackage rec { pytest-asyncio pytest-timeout pytestCheckHook - ] - ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; + ]; pytestFlags = [ "--asyncio-mode=auto" ]; diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index bd4b41bae529..65bb58d1e48e 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -8,9 +8,7 @@ pytest-env, pytest-mock, pytestCheckHook, - pythonOlder, setuptools, - typing-extensions, }: buildPythonPackage rec { @@ -27,7 +25,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ botocore ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + dependencies = [ botocore ]; optional-dependencies = { signal = [ blinker ]; diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix index e65d3c8d7b1f..fe5268a592a6 100644 --- a/pkgs/development/python-modules/pyogrio/default.nix +++ b/pkgs/development/python-modules/pyogrio/default.nix @@ -37,8 +37,7 @@ buildPythonPackage rec { setuptools versioneer wheel - ] - ++ versioneer.optional-dependencies.toml; + ]; buildInputs = [ gdal ]; diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index 35f7065a71dd..fb364148bcf5 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system flit-core, @@ -12,9 +11,6 @@ sphinx-rtd-theme, myst-parser, - # propagates - typing-extensions, - # optionals cryptography, pillow, @@ -57,8 +53,6 @@ buildPythonPackage rec { myst-parser ]; - dependencies = lib.optionals (pythonOlder "3.11") [ typing-extensions ]; - optional-dependencies = rec { full = crypto ++ image; crypto = [ cryptography ]; diff --git a/pkgs/development/python-modules/pyppeteer-ng/default.nix b/pkgs/development/python-modules/pyppeteer-ng/default.nix index 5e2168a8f1cb..135c4ec30ffc 100644 --- a/pkgs/development/python-modules/pyppeteer-ng/default.nix +++ b/pkgs/development/python-modules/pyppeteer-ng/default.nix @@ -26,7 +26,6 @@ pytest-timeout, pytest-xdist, pytestCheckHook, - pythonOlder, readme-renderer, sphinx, sphinxcontrib-asyncio, diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 9cdefcf89b99..fe3f754b0ea6 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, replaceVars, certifi, @@ -21,8 +20,6 @@ buildPythonPackage rec { version = "3.7.2"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "pyproj4"; repo = "pyproj"; diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix index 8af34616e46e..611f79a8bd20 100644 --- a/pkgs/development/python-modules/pyproject-api/default.nix +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build time hatchling, @@ -10,7 +9,6 @@ # runtime packaging, - tomli, # docs sphinxHook, @@ -51,7 +49,7 @@ buildPythonPackage rec { sphinx-autodoc-typehints ]; - dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + dependencies = [ packaging ]; nativeCheckInputs = [ pytest-mock diff --git a/pkgs/development/python-modules/pyproject-hooks/default.nix b/pkgs/development/python-modules/pyproject-hooks/default.nix index b1cf6a1628d2..09ff87c3c6df 100644 --- a/pkgs/development/python-modules/pyproject-hooks/default.nix +++ b/pkgs/development/python-modules/pyproject-hooks/default.nix @@ -5,10 +5,8 @@ flit-core, pyproject-hooks, pytestCheckHook, - pythonOlder, setuptools, testpath, - tomli, }: buildPythonPackage rec { @@ -24,8 +22,6 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ tomli ]; - # We need to disable tests because this package is part of the bootstrap chain # and its test dependencies cannot be built yet when this is being built. doCheck = false; diff --git a/pkgs/development/python-modules/pyproject-metadata/default.nix b/pkgs/development/python-modules/pyproject-metadata/default.nix index dde645803836..625c65d4ccdd 100644 --- a/pkgs/development/python-modules/pyproject-metadata/default.nix +++ b/pkgs/development/python-modules/pyproject-metadata/default.nix @@ -5,8 +5,6 @@ flit-core, packaging, pytestCheckHook, - pythonOlder, - tomli, }: buildPythonPackage rec { @@ -24,7 +22,7 @@ buildPythonPackage rec { dependencies = [ packaging ]; - nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + nativeCheckInputs = [ pytestCheckHook ]; # Many broken tests, and missing test files doCheck = false; diff --git a/pkgs/development/python-modules/pyps4-2ndscreen/default.nix b/pkgs/development/python-modules/pyps4-2ndscreen/default.nix index 15ac17012048..6d6a6f51fd9a 100644 --- a/pkgs/development/python-modules/pyps4-2ndscreen/default.nix +++ b/pkgs/development/python-modules/pyps4-2ndscreen/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, - pythonOlder, setuptools, aiohttp, click, @@ -44,15 +43,15 @@ buildPythonPackage rec { pycryptodomex ]; + # All require asynctest, which is unsupported on 3.11+ + doCheck = false; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook asynctest ]; - # Disable tests for Python 3.11+ since they all require asynctest - doCheck = pythonOlder "3.11"; - pythonImportsCheck = [ "pyps4_2ndscreen" ]; meta = { diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index f11b613c9f27..c4ffb082a756 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchPypi, poetry-core, - pythonOlder, }: buildPythonPackage rec { @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "1.2.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { inherit pname version; hash = "sha256-Otk5W3VTbOAeZOVnXvW8VSxU1nHa8zUvmvduRTdlwVs="; diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix index 1085eb814046..e59b5a018ebf 100644 --- a/pkgs/development/python-modules/pysml/default.nix +++ b/pkgs/development/python-modules/pysml/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, poetry-core, pyserial-asyncio-fast, - pythonOlder, }: buildPythonPackage rec { @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "0.1.5"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "mtdcr"; repo = "pysml"; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index c7d02eef630f..87062960a7cb 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -6,7 +6,6 @@ pythonOlder, pytest, setuptools-scm, - backports-asyncio-runner, typing-extensions, }: @@ -33,13 +32,9 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - dependencies = - lib.optionals (pythonOlder "3.11") [ - backports-asyncio-runner - ] - ++ lib.optionals (pythonOlder "3.13") [ - typing-extensions - ]; + dependencies = lib.optionals (pythonOlder "3.13") [ + typing-extensions + ]; postInstall = '' mkdir $testout diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix index 92573dfdcb0a..811bb87e5968 100644 --- a/pkgs/development/python-modules/pytest-resource-path/default.nix +++ b/pkgs/development/python-modules/pytest-resource-path/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, colorama, pytest, diff --git a/pkgs/development/python-modules/pytest/7.nix b/pkgs/development/python-modules/pytest/7.nix index 5f66d14c1944..6641f4097222 100644 --- a/pkgs/development/python-modules/pytest/7.nix +++ b/pkgs/development/python-modules/pytest/7.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, callPackage, - pythonOlder, fetchPypi, writeText, @@ -12,11 +11,9 @@ # dependencies attrs, - exceptiongroup, iniconfig, packaging, pluggy, - tomli, # optional-dependencies argcomplete, @@ -52,10 +49,6 @@ let iniconfig packaging pluggy - ] - ++ lib.optionals (pythonOlder "3.11") [ - exceptiongroup - tomli ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/pytest/8_3.nix b/pkgs/development/python-modules/pytest/8_3.nix index db07a7aee84a..aff92f835c6d 100644 --- a/pkgs/development/python-modules/pytest/8_3.nix +++ b/pkgs/development/python-modules/pytest/8_3.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, callPackage, - pythonOlder, fetchPypi, writeText, @@ -12,11 +11,9 @@ # dependencies attrs, - exceptiongroup, iniconfig, packaging, pluggy, - tomli, # optional-dependencies argcomplete, @@ -52,10 +49,6 @@ buildPythonPackage rec { packaging pluggy pygments - ] - ++ lib.optionals (pythonOlder "3.11") [ - exceptiongroup - tomli ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 1eabeed0c38e..dac23d2351cd 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, callPackage, - pythonOlder, fetchPypi, writeText, @@ -12,11 +11,9 @@ # dependencies attrs, - exceptiongroup, iniconfig, packaging, pluggy, - tomli, # optional-dependencies argcomplete, @@ -52,10 +49,6 @@ buildPythonPackage rec { packaging pluggy pygments - ] - ++ lib.optionals (pythonOlder "3.11") [ - exceptiongroup - tomli ]; optional-dependencies = { diff --git a/pkgs/development/python-modules/python-awair/default.nix b/pkgs/development/python-modules/python-awair/default.nix index d4a04a62a4f0..53bf3102f2eb 100644 --- a/pkgs/development/python-modules/python-awair/default.nix +++ b/pkgs/development/python-modules/python-awair/default.nix @@ -7,7 +7,6 @@ pytest-asyncio, pytest-aiohttp, pytestCheckHook, - pythonOlder, voluptuous, vcrpy, }: diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index 29905cfd5ac0..dce3327300aa 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -8,7 +8,6 @@ pycryptodome, pytest-asyncio, pytestCheckHook, - pythonOlder, requests-mock, requests, six, @@ -22,8 +21,6 @@ buildPythonPackage rec { version = "1.0.34"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "sammchardy"; repo = "python-binance"; diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 2b7b479fd0da..24cc7b78aa33 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -5,12 +5,10 @@ fetchFromGitHub, msgpack, pytestCheckHook, - pythonOlder, pyyaml, ruamel-yaml, setuptools, toml, - tomli, tomli-w, }: @@ -40,7 +38,7 @@ buildPythonPackage rec { yaml = [ ruamel-yaml ]; ruamel-yaml = [ ruamel-yaml ]; PyYAML = [ pyyaml ]; - tomli = [ tomli-w ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + tomli = [ tomli-w ]; toml = [ toml ]; msgpack = [ msgpack ]; }; diff --git a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix index 7a4f248d3637..ae64842dd512 100644 --- a/pkgs/development/python-modules/python-homeassistant-analytics/default.nix +++ b/pkgs/development/python-modules/python-homeassistant-analytics/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system poetry-core, @@ -26,8 +25,6 @@ buildPythonPackage rec { version = "0.9.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "joostlek"; repo = "python-homeassistant-analytics"; diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix index afdf7094eeaf..e129a26a5f2f 100644 --- a/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/pkgs/development/python-modules/python-lsp-black/default.nix @@ -48,8 +48,7 @@ buildPythonPackage rec { dependencies = [ black python-lsp-server - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; pythonImportsCheck = [ "pylsp_black" ]; diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix index ded4e7073e8b..08f2d8b1fbd5 100644 --- a/pkgs/development/python-modules/python-lsp-ruff/default.nix +++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, ruff, @@ -10,7 +9,6 @@ cattrs, lsprotocol, python-lsp-server, - tomli, # checks pytestCheckHook, @@ -65,8 +63,7 @@ buildPythonPackage rec { cattrs lsprotocol python-lsp-server - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix index 4c044c69b1cf..df695bb88631 100644 --- a/pkgs/development/python-modules/python-ndn/default.nix +++ b/pkgs/development/python-modules/python-ndn/default.nix @@ -10,7 +10,6 @@ pycryptodomex, pygtrie, pytestCheckHook, - pythonOlder, setuptools, }: @@ -27,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-8fcBIcZ2l6mkKe9YQe5+5fh7+vK9qxzBO2kLRUONumQ="; }; - disabled = pythonOlder "3.11"; - nativeBuildInputs = [ setuptools poetry-core diff --git a/pkgs/development/python-modules/python-opendata-transport/default.nix b/pkgs/development/python-modules/python-opendata-transport/default.nix index 89e9b10c2089..03387302dbb1 100644 --- a/pkgs/development/python-modules/python-opendata-transport/default.nix +++ b/pkgs/development/python-modules/python-opendata-transport/default.nix @@ -3,7 +3,6 @@ aiohttp, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, urllib3, }: @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { pname = "python_opendata_transport"; inherit version; diff --git a/pkgs/development/python-modules/python-opensky/default.nix b/pkgs/development/python-modules/python-opensky/default.nix index 2dac54dac914..49391b7b032e 100644 --- a/pkgs/development/python-modules/python-opensky/default.nix +++ b/pkgs/development/python-modules/python-opensky/default.nix @@ -9,7 +9,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, syrupy, yarl, }: @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "1.0.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "joostlek"; repo = "python-opensky"; diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index ee8a5e1f2455..8c77598f91cf 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -8,7 +8,6 @@ flask, pytest-asyncio, pytest-trio, - pythonOlder, pytestCheckHook, setuptools, trio, @@ -39,7 +38,6 @@ buildPythonPackage rec { ]; optional-dependencies = { - asyncio = lib.optionals (pythonOlder "3.11") [ async-timeout ]; trio = [ trio ]; curio = [ curio ]; anyio = [ anyio ]; diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index b227c7a7b368..af7def06f0c7 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -7,7 +7,6 @@ openstacksdk, pbr, python-keystoneclient, - pythonOlder, stestr, }: diff --git a/pkgs/development/python-modules/python-technove/default.nix b/pkgs/development/python-modules/python-technove/default.nix index 64070ae59ef4..3dab7d937419 100644 --- a/pkgs/development/python-modules/python-technove/default.nix +++ b/pkgs/development/python-modules/python-technove/default.nix @@ -11,7 +11,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, yarl, }: @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "Moustachauve"; repo = "pytechnove"; diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix index ce09a610ef29..07c817909c6c 100644 --- a/pkgs/development/python-modules/python-vlc/default.nix +++ b/pkgs/development/python-modules/python-vlc/default.nix @@ -5,7 +5,6 @@ setuptools, libvlc, replaceVars, - pythonOlder, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 4f2eda82a2c1..9ec7637b3e83 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -6,7 +6,6 @@ gql, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, websockets, }: @@ -16,8 +15,6 @@ buildPythonPackage (finalAttrs: { version = "0.35.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyTibber"; diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix index ea0754a71728..0f5ef30d7c15 100644 --- a/pkgs/development/python-modules/pytoolconfig/default.nix +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -8,13 +8,11 @@ platformdirs, pydantic, pytestCheckHook, - pythonOlder, sphinx, sphinx-autodoc-typehints, sphinx-rtd-theme, sphinxHook, tabulate, - tomli, }: buildPythonPackage rec { @@ -47,7 +45,7 @@ buildPythonPackage rec { ] ++ optional-dependencies.doc; - propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + propagatedBuildInputs = [ packaging ]; optional-dependencies = { validation = [ pydantic ]; diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 683da1aab617..b655596b1450 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, pytestCheckHook, setuptools, tokenize-rt, diff --git a/pkgs/development/python-modules/pyvera/default.nix b/pkgs/development/python-modules/pyvera/default.nix index 445b79fa65cf..4ff15a35dedc 100644 --- a/pkgs/development/python-modules/pyvera/default.nix +++ b/pkgs/development/python-modules/pyvera/default.nix @@ -8,7 +8,6 @@ pytest-timeout, responses, pytestCheckHook, - pythonOlder, requests, }: @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "0.3.16"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "pavoni"; repo = "pyvera"; diff --git a/pkgs/development/python-modules/pyversasense/default.nix b/pkgs/development/python-modules/pyversasense/default.nix index 2d0fb02fe512..98e2c8d74f40 100644 --- a/pkgs/development/python-modules/pyversasense/default.nix +++ b/pkgs/development/python-modules/pyversasense/default.nix @@ -6,7 +6,6 @@ fetchFromGitHub, pytest-asyncio, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -23,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - doCheck = pythonOlder "3.11"; # asynctest unsupported on python3.11 + doCheck = false; # asynctest unsupported on 3.11+ nativeCheckInputs = [ asynctest diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 26282b0bbf8b..e707085be503 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -7,7 +7,6 @@ cffi, fetchPypi, pycparser, - pythonOlder, setuptools, }: @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "9.2.154"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { inherit pname version; hash = "sha256-a3ei2w66v18QKAofpPvDUoM42zHRHPrNQic+FE+rLKY="; diff --git a/pkgs/development/python-modules/pyvisa-sim/default.nix b/pkgs/development/python-modules/pyvisa-sim/default.nix index cc41d2b02efe..598b93924c0d 100644 --- a/pkgs/development/python-modules/pyvisa-sim/default.nix +++ b/pkgs/development/python-modules/pyvisa-sim/default.nix @@ -1,7 +1,6 @@ { lib, fetchPypi, - pythonOlder, buildPythonPackage, pyvisa, pyyaml, diff --git a/pkgs/development/python-modules/pywaze/default.nix b/pkgs/development/python-modules/pywaze/default.nix index d53460dc4717..5e5e3d7f09ee 100644 --- a/pkgs/development/python-modules/pywaze/default.nix +++ b/pkgs/development/python-modules/pywaze/default.nix @@ -7,7 +7,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, respx, }: @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "1.1.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "eifinger"; repo = "pywaze"; diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix index 830020beb023..a87642a979e1 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/default.nix +++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix @@ -7,7 +7,6 @@ opentelemetry-sdk, pytest-asyncio, pytestCheckHook, - pythonOlder, qcs-api-client-common, quil, rustPlatform, diff --git a/pkgs/development/python-modules/quart-trio/default.nix b/pkgs/development/python-modules/quart-trio/default.nix index 67170265ca70..584249b8d107 100644 --- a/pkgs/development/python-modules/quart-trio/default.nix +++ b/pkgs/development/python-modules/quart-trio/default.nix @@ -40,10 +40,7 @@ buildPythonPackage rec { quart trio ] - ++ hypercorn.optional-dependencies.trio - ++ lib.optionals (pythonOlder "3.11") [ - exceptiongroup - ]; + ++ hypercorn.optional-dependencies.trio; pythonImportsCheck = [ "quart_trio" diff --git a/pkgs/development/python-modules/radios/default.nix b/pkgs/development/python-modules/radios/default.nix index 599f90c0258a..ed4ec2d5cb0e 100644 --- a/pkgs/development/python-modules/radios/default.nix +++ b/pkgs/development/python-modules/radios/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, poetry-core, aiodns, @@ -24,8 +23,6 @@ buildPythonPackage rec { version = "0.3.2"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "frenck"; repo = "python-radios"; diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 79b19a0ed0db..af9c31f30eec 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -3,13 +3,11 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, # builds poetry-core, # propagates - isodate, pyparsing, # extras: networkx @@ -41,8 +39,7 @@ buildPythonPackage rec { dependencies = [ pyparsing - ] - ++ lib.optionals (pythonOlder "3.11") [ isodate ]; + ]; optional-dependencies = { html = [ html5lib ]; diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 54b53b2bd3a9..badf42cfa893 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -5,11 +5,9 @@ pytest-asyncio, pytest-httpserver, pytestCheckHook, - pythonOlder, pyyaml, requests, setuptools, - tomli, tomli-w, types-pyyaml, types-toml, @@ -45,8 +43,7 @@ buildPythonPackage rec { pytest-httpserver pytestCheckHook tomli-w - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; pythonImportsCheck = [ "responses" ]; diff --git a/pkgs/development/python-modules/romy/default.nix b/pkgs/development/python-modules/romy/default.nix index c09b537da86a..bf334ecca73b 100644 --- a/pkgs/development/python-modules/romy/default.nix +++ b/pkgs/development/python-modules/romy/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, setuptools, - pythonOlder, aiohttp, }: @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "0.0.10"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "xeniter"; repo = "romy"; diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix index 0554f2018c64..912d1b52c390 100644 --- a/pkgs/development/python-modules/rstcheck-core/default.nix +++ b/pkgs/development/python-modules/rstcheck-core/default.nix @@ -8,7 +8,6 @@ pydantic, pytest-mock, pytestCheckHook, - pythonOlder, setuptools, setuptools-scm, }: diff --git a/pkgs/development/python-modules/safehttpx/default.nix b/pkgs/development/python-modules/safehttpx/default.nix index 95614467399f..52b03022a64f 100644 --- a/pkgs/development/python-modules/safehttpx/default.nix +++ b/pkgs/development/python-modules/safehttpx/default.nix @@ -4,7 +4,6 @@ fetchPypi, hatchling, httpx, - pythonOlder, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index abbb3a538b73..6c01e6d32e1e 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, hatchling, setuptools, diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index 94f1a6ac74a7..a436bb78aa32 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system hatch-vcs, @@ -13,7 +12,6 @@ # dependencies packaging, pathspec, - exceptiongroup, # tests build, @@ -23,7 +21,6 @@ pytest-subprocess, pytestCheckHook, setuptools, - tomli, virtualenv, wheel, }: @@ -40,10 +37,7 @@ buildPythonPackage rec { hash = "sha256-zBTDacTkeclz+/X0SUl1xkxLz4zsfeLOD4Ew0V1Y1iU="; }; - postPatch = lib.optionalString (pythonOlder "3.11") '' - substituteInPlace pyproject.toml \ - --replace-fail '"error",' '"error", "ignore::UserWarning",' - ''; + postPatch = ""; build-system = [ hatch-vcs @@ -53,10 +47,6 @@ buildPythonPackage rec { dependencies = [ packaging pathspec - ] - ++ lib.optionals (pythonOlder "3.11") [ - exceptiongroup - tomli ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 221eeff0da87..31f0a1d2b65f 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, fetchpatch2, hatch-fancy-pypi-readme, @@ -11,7 +10,6 @@ packaging, setuptools, wheel, - tomli, # Test Inputs cmake, cython, @@ -61,8 +59,7 @@ buildPythonPackage rec { packaging setuptools wheel - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; nativeCheckInputs = [ cmake diff --git a/pkgs/development/python-modules/scipy-stubs/default.nix b/pkgs/development/python-modules/scipy-stubs/default.nix index b80326df0301..9ca5818092a0 100644 --- a/pkgs/development/python-modules/scipy-stubs/default.nix +++ b/pkgs/development/python-modules/scipy-stubs/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, uv-build, optype, scipy, @@ -25,8 +24,6 @@ buildPythonPackage rec { --replace-fail "uv_build>=0.9.0,<0.10.0" "uv_build" ''; - disabled = pythonOlder "3.11"; - build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/sensai-utils/default.nix b/pkgs/development/python-modules/sensai-utils/default.nix index 8364f07a5577..ddf21ca0a25c 100644 --- a/pkgs/development/python-modules/sensai-utils/default.nix +++ b/pkgs/development/python-modules/sensai-utils/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, setuptools, typing-extensions, }: @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "1.6.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "opcode81"; repo = "sensAI-utils"; diff --git a/pkgs/development/python-modules/sensoterra/default.nix b/pkgs/development/python-modules/sensoterra/default.nix index a592bd652fc3..da398e4e0510 100644 --- a/pkgs/development/python-modules/sensoterra/default.nix +++ b/pkgs/development/python-modules/sensoterra/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, requests, setuptools, }: @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "2.0.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchPypi { inherit pname version; hash = "sha256-WfjTOns5OPU8+ufDeFdDGjURhBWUFfw/qRSHQazBL04="; diff --git a/pkgs/development/python-modules/setuptools-generate/default.nix b/pkgs/development/python-modules/setuptools-generate/default.nix index 9f8baf22be04..adb0cec964a7 100644 --- a/pkgs/development/python-modules/setuptools-generate/default.nix +++ b/pkgs/development/python-modules/setuptools-generate/default.nix @@ -2,13 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools-scm, click, help2man, markdown-it-py, shtab, - tomli, pytestCheckHook, }: @@ -31,8 +29,7 @@ buildPythonPackage rec { help2man markdown-it-py shtab - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/setuptools-git-versioning/default.nix b/pkgs/development/python-modules/setuptools-git-versioning/default.nix index 6fca2190c92d..d9bd8d9e80b0 100644 --- a/pkgs/development/python-modules/setuptools-git-versioning/default.nix +++ b/pkgs/development/python-modules/setuptools-git-versioning/default.nix @@ -8,9 +8,7 @@ packaging, pytestCheckHook, pytest-rerunfailures, - pythonOlder, setuptools, - tomli, tomli-w, }: @@ -34,16 +32,12 @@ buildPythonPackage rec { build-system = [ packaging setuptools - ] - ++ lib.optionals (pythonOlder "3.11") [ - tomli ]; dependencies = [ packaging setuptools - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; pythonImportsCheck = [ "setuptools_git_versioning" ]; diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index 3ea64a6d0d02..876eb1e9cbd8 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, callPackage, fetchPypi, - pythonOlder, # build-system setuptools, @@ -11,7 +10,6 @@ # dependencies packaging, typing-extensions, - tomli, # optional-dependencies rich, @@ -28,23 +26,15 @@ buildPythonPackage rec { hash = "sha256-HGdKtGZWhqCIfX4kwDqyXyQgHCE+guponS8+Fp7371c="; }; - postPatch = - if (pythonOlder "3.11") then - '' - substituteInPlace pyproject.toml \ - --replace-fail 'tomli<=2.0.2' 'tomli' - '' - else - null; + postPatch = null; - build-system = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + build-system = [ setuptools ]; dependencies = [ packaging setuptools typing-extensions - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; optional-dependencies = { rich = [ rich ]; diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index f7fdef8685ed..bd44c37972cb 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, cython, geos, @@ -18,7 +17,6 @@ buildPythonPackage rec { pname = "shapely"; version = "2.1.2"; pyproject = true; - disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "shapely"; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 7ecf4891b2b7..dd64f16ead8b 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,11 +2,9 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, setuptools-scm, packaging, - tomli, # tests poppler-qt5, @@ -32,8 +30,7 @@ buildPythonPackage rec { dependencies = [ packaging setuptools - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; # There aren't tests doCheck = false; diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index 92c21fb86c5a..cff4d35bfb18 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -8,7 +8,6 @@ flit-core, lxml, pyjwt, - pythonOlder, }: buildPythonPackage rec { @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "1.3.11"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "lendy007"; repo = "skodaconnect"; diff --git a/pkgs/development/python-modules/skops/default.nix b/pkgs/development/python-modules/skops/default.nix index 80860f51a307..27784318853d 100644 --- a/pkgs/development/python-modules/skops/default.nix +++ b/pkgs/development/python-modules/skops/default.nix @@ -12,7 +12,6 @@ prettytable, pytest-cov-stub, pytestCheckHook, - pythonOlder, pyyaml, rich, scikit-learn, diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 6c43296561df..98619aa26173 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, flit, click, cryptography, diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index 0b4829d4a741..17973333df6b 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/pkgs/development/python-modules/soxr/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system cmake, @@ -11,7 +10,6 @@ scikit-build-core, setuptools, setuptools-scm, - typing-extensions, # native dependencies libsoxr, @@ -53,9 +51,6 @@ buildPythonPackage rec { nanobind setuptools setuptools-scm - ] - ++ lib.optionals (pythonOlder "3.11") [ - typing-extensions ]; buildInputs = [ libsoxr ]; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index d6a5c137cdb0..fb99c84de0bd 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -27,7 +27,6 @@ sphinxcontrib-qthelp, sphinxcontrib-serializinghtml, sphinxcontrib-websupport, - tomli, # check phase defusedxml, @@ -82,8 +81,7 @@ buildPythonPackage rec { sphinxcontrib-serializinghtml # extra[docs] sphinxcontrib-websupport - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix index c067c55bc2f3..2a73d88a0eb1 100644 --- a/pkgs/development/python-modules/statmake/default.nix +++ b/pkgs/development/python-modules/statmake/default.nix @@ -3,13 +3,11 @@ attrs, buildPythonPackage, cattrs, - exceptiongroup, fetchFromGitHub, fonttools, fs, poetry-core, pytestCheckHook, - pythonOlder, ufo2ft, ufolib2, hatchling, @@ -41,8 +39,7 @@ buildPythonPackage rec { fonttools # required by fonttools[ufo] fs - ] - ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/sunwatcher/default.nix b/pkgs/development/python-modules/sunwatcher/default.nix index 0a3d7a1a1bd6..b0d11070116a 100644 --- a/pkgs/development/python-modules/sunwatcher/default.nix +++ b/pkgs/development/python-modules/sunwatcher/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, requests, setuptools, }: diff --git a/pkgs/development/python-modules/systembridgemodels/default.nix b/pkgs/development/python-modules/systembridgemodels/default.nix index 151fcd1f3cf0..a548b08957d5 100644 --- a/pkgs/development/python-modules/systembridgemodels/default.nix +++ b/pkgs/development/python-modules/systembridgemodels/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, setuptools, pytestCheckHook, @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "5.1.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-models"; diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix index f31b7e20df8d..b2282677ee3b 100644 --- a/pkgs/development/python-modules/tabcmd/default.nix +++ b/pkgs/development/python-modules/tabcmd/default.nix @@ -9,7 +9,6 @@ pytest-order, pytestCheckHook, python, - pythonOlder, requests, setuptools, setuptools-scm, diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index 65f69562e5fa..43163090bad9 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -10,7 +10,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, yarl, }: @@ -19,8 +18,6 @@ buildPythonPackage rec { version = "0.6.2"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "frenck"; repo = "python-tailscale"; diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix index a755fe339a21..3546f2b8701d 100644 --- a/pkgs/development/python-modules/temporalio/default.nix +++ b/pkgs/development/python-modules/temporalio/default.nix @@ -13,8 +13,6 @@ protobuf, types-protobuf, typing-extensions, - pythonOlder, - python-dateutil, # nativeBuildInputs cargo, @@ -61,8 +59,7 @@ buildPythonPackage rec { protobuf types-protobuf typing-extensions - ] - ++ lib.optional (pythonOlder "3.11") python-dateutil; + ]; nativeBuildInputs = [ cargo diff --git a/pkgs/development/python-modules/terminaltables3/default.nix b/pkgs/development/python-modules/terminaltables3/default.nix index 6f7b82e329d6..5ddd2375ba28 100644 --- a/pkgs/development/python-modules/terminaltables3/default.nix +++ b/pkgs/development/python-modules/terminaltables3/default.nix @@ -8,7 +8,6 @@ pytest-cov-stub, pytest-xdist, pytestCheckHook, - pythonOlder, termcolor, }: @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "4.0.0-unstable-2024-07-21"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "matthewdeanmartin"; repo = "terminaltables3"; diff --git a/pkgs/development/python-modules/tianshou/default.nix b/pkgs/development/python-modules/tianshou/default.nix index c06e0a943256..c6861b965d34 100644 --- a/pkgs/development/python-modules/tianshou/default.nix +++ b/pkgs/development/python-modules/tianshou/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -50,8 +49,6 @@ buildPythonPackage rec { version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "thu-ml"; repo = "tianshou"; diff --git a/pkgs/development/python-modules/todoist-api-python/default.nix b/pkgs/development/python-modules/todoist-api-python/default.nix index 3946537df1cf..100a41ef5a6b 100644 --- a/pkgs/development/python-modules/todoist-api-python/default.nix +++ b/pkgs/development/python-modules/todoist-api-python/default.nix @@ -7,7 +7,6 @@ hatchling, pytest-asyncio, pytestCheckHook, - pythonOlder, requests, responses, }: diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix index 3d2b37967128..c395192d0b30 100644 --- a/pkgs/development/python-modules/torch/bin/default.nix +++ b/pkgs/development/python-modules/torch/bin/default.nix @@ -3,7 +3,6 @@ stdenv, python, buildPythonPackage, - pythonOlder, pythonAtLeast, fetchurl, @@ -45,7 +44,7 @@ buildPythonPackage { format = "wheel"; - disabled = (pythonOlder "3.10") || (pythonAtLeast "3.15"); + disabled = pythonAtLeast "3.15"; src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 2e9e5bd3f533..119635676d7e 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -4,7 +4,6 @@ buildPythonPackage, python, fetchurl, - pythonOlder, pythonAtLeast, # buildInputs @@ -34,7 +33,7 @@ buildPythonPackage (finalAttrs: { in fetchurl srcs; - disabled = (pythonOlder "3.10") || (pythonAtLeast "3.15"); + disabled = pythonAtLeast "3.15"; buildInputs = [ # We need to patch lib/torio/_torio_ffmpeg6 diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index d689cf36db58..468d28515e20 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -4,7 +4,6 @@ python, buildPythonPackage, fetchurl, - pythonOlder, pythonAtLeast, # buildInputs @@ -34,7 +33,7 @@ buildPythonPackage { src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; - disabled = (pythonOlder "3.10") || (pythonAtLeast "3.15"); + disabled = pythonAtLeast "3.15"; # Note that we don't rely on config.cudaSupport here, because the Linux wheels all come built with CUDA support. buildInputs = diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index dccb5ba0ecf3..12120c516745 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -9,8 +9,6 @@ jinja2, mock, pytestCheckHook, - pythonOlder, - tomli, twisted, }: @@ -30,8 +28,7 @@ buildPythonPackage rec { click incremental jinja2 - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; preCheck = '' export PATH=$out/bin:$PATH diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 78372feda816..f0fe6f08287d 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -2,11 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, packaging, pluggy, virtualenv, - tomli, filelock, hatchling, hatch-vcs, @@ -17,7 +15,6 @@ cachetools, testers, tox, - typing-extensions, }: buildPythonPackage rec { @@ -47,10 +44,6 @@ buildPythonPackage rec { pluggy pyproject-api virtualenv - ] - ++ lib.optionals (pythonOlder "3.11") [ - tomli - typing-extensions ]; doCheck = false; # infinite recursion via devpi-client diff --git a/pkgs/development/python-modules/trakit/default.nix b/pkgs/development/python-modules/trakit/default.nix index d5db7f459427..d6fd6f95c356 100644 --- a/pkgs/development/python-modules/trakit/default.nix +++ b/pkgs/development/python-modules/trakit/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build dependencies poetry-core, @@ -22,8 +21,6 @@ buildPythonPackage rec { version = "0.2.5"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "ratoaq2"; repo = "trakit"; diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix index e29d707ab897..739fb0c2d3ee 100644 --- a/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -7,11 +7,9 @@ trio, outcome, sniffio, - exceptiongroup, pytest-trio, pytestCheckHook, pythonAtLeast, - pythonOlder, }: buildPythonPackage rec { @@ -41,8 +39,7 @@ buildPythonPackage rec { trio outcome sniffio - ] - ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; + ]; pytestFlags = [ # RuntimeWarning: Can't run the Python asyncio tests because they're not installed diff --git a/pkgs/development/python-modules/trio-websocket/default.nix b/pkgs/development/python-modules/trio-websocket/default.nix index 150a62bc9ce1..544d767cbdf4 100644 --- a/pkgs/development/python-modules/trio-websocket/default.nix +++ b/pkgs/development/python-modules/trio-websocket/default.nix @@ -3,9 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, - exceptiongroup, pytest-trio, pytestCheckHook, trio, @@ -30,8 +28,7 @@ buildPythonPackage rec { dependencies = [ trio wsproto - ] - ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; + ]; nativeCheckInputs = [ pytest-trio diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 15b78e9bdef1..7bfd2857a611 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -9,7 +9,6 @@ # dependencies attrs, - exceptiongroup, idna, outcome, sniffio, @@ -54,8 +53,7 @@ buildPythonPackage rec { outcome sniffio sortedcontainers - ] - ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; + ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index a70016ff0763..9698aa8c9b02 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -8,7 +8,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, yarl, }: @@ -17,8 +16,6 @@ buildPythonPackage rec { version = "2.2.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "frenck"; repo = "python-twentemilieu"; diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 933a37720917..d49e81aa09dd 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -15,11 +15,8 @@ pytestCheckHook, python-dotenv, pythonAtLeast, - pythonOlder, rich-click, sybil, - tomli, - typing-extensions, }: buildPythonPackage rec { pname = "typed-settings"; @@ -34,8 +31,6 @@ buildPythonPackage rec { build-system = [ hatchling ]; - dependencies = lib.optionals (pythonOlder "3.11") [ tomli ]; - optional-dependencies = { all = [ attrs @@ -66,8 +61,7 @@ buildPythonPackage rec { rich-click sybil ] - ++ (lib.optional (pythonOlder "3.11") typing-extensions) - ++ (lib.concatAttrValues optional-dependencies); + ++ lib.concatAttrValues optional-dependencies; enabledTestPaths = [ "tests" ]; diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 087cfdc531e4..27c60f8db34e 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -3,13 +3,11 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system setuptools, # dependencies - async-timeout, bellows, click, coloredlogs, @@ -55,7 +53,6 @@ buildPythonPackage rec { typing-extensions zigpy ] - ++ lib.optionals (pythonOlder "3.11") [ async-timeout ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libgpiod ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index ea49f861becd..49755902d145 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -5,7 +5,6 @@ hatchling, pyserial-asyncio-fast, pytestCheckHook, - pythonOlder, pytz, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "0.6.1"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "gwww"; repo = "upb-lib"; diff --git a/pkgs/development/python-modules/uplink/default.nix b/pkgs/development/python-modules/uplink/default.nix index b63878a65280..3098da9500ca 100644 --- a/pkgs/development/python-modules/uplink/default.nix +++ b/pkgs/development/python-modules/uplink/default.nix @@ -14,7 +14,6 @@ pytest-asyncio, pytest-twisted, twisted, - pythonOlder, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 25152e65c4a5..9bdc07615fe1 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -8,12 +8,10 @@ httptools, python-dotenv, pyyaml, - typing-extensions, uvloop, watchfiles, websockets, hatchling, - pythonOlder, }: buildPythonPackage rec { @@ -38,8 +36,7 @@ buildPythonPackage rec { dependencies = [ click h11 - ] - ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; + ]; optional-dependencies.standard = [ httptools diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index e30114111b82..629c2cba2e0d 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, fetchpatch, @@ -74,9 +73,6 @@ buildPythonPackage rec { # https://github.com/MagicStack/uvloop/issues/709 "tests/test_process.py::TestAsyncio_AIO_Process::test_cancel_post_init" ] - ++ lib.optionals (pythonOlder "3.11") [ - "tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat" - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # Segmentation fault "tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" diff --git a/pkgs/development/python-modules/vacuum-map-parser-base/default.nix b/pkgs/development/python-modules/vacuum-map-parser-base/default.nix index 544ba4356012..1c600d96ff5c 100644 --- a/pkgs/development/python-modules/vacuum-map-parser-base/default.nix +++ b/pkgs/development/python-modules/vacuum-map-parser-base/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, poetry-core, pillow, @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "0.1.5"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "PiotrMachowski"; repo = "Python-package-${pname}"; diff --git a/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix b/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix index 9c2b794d149c..d23520cd2871 100644 --- a/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix +++ b/pkgs/development/python-modules/vacuum-map-parser-roborock/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, poetry-core, pillow, @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "0.1.4"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "PiotrMachowski"; repo = "Python-package-${pname}"; diff --git a/pkgs/development/python-modules/valkey/default.nix b/pkgs/development/python-modules/valkey/default.nix index 3ea3640deebf..7df38212e42f 100644 --- a/pkgs/development/python-modules/valkey/default.nix +++ b/pkgs/development/python-modules/valkey/default.nix @@ -9,9 +9,6 @@ # build-system setuptools, - # dependencies - async-timeout, - # optional-dependencies cryptography, pyopenssl, @@ -51,8 +48,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = lib.optionals (pythonOlder "3.11") [ async-timeout ]; - optional-dependencies = { # TODO: libvalkey = [ libvalkey ]; ocsp = [ diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 9c82e064c2a8..2b31b2e4b0f7 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, fetchpatch, - pythonOlder, click, click-log, click-threading, diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix index 62302b0dc854..69e753c08bdf 100644 --- a/pkgs/development/python-modules/vehicle/default.nix +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -10,7 +10,6 @@ pytest-asyncio, pytest-cov-stub, pytestCheckHook, - pythonOlder, syrupy, yarl, }: @@ -20,8 +19,6 @@ buildPythonPackage rec { version = "2.2.2"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "frenck"; repo = "python-vehicle"; diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index a138a9a92906..762d086ac3dc 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -2,9 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, - tomli, }: buildPythonPackage rec { @@ -19,11 +17,7 @@ buildPythonPackage rec { hash = "sha256-3b7Wfhd24Vym5XCeN/M1832Q1VzvlWi3quTRaZrID2s="; }; - nativeBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - - optional-dependencies = { - toml = lib.optionals (pythonOlder "3.11") [ tomli ]; - }; + nativeBuildInputs = [ setuptools ]; # Couldn't get tests to work because, for instance, they used virtualenv and pip doCheck = false; diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index edd16726c0f2..9c7ea7bfd6df 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -1,10 +1,8 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, packaging, - tomli, pytestCheckHook, build, hatchling, @@ -35,8 +33,7 @@ buildPythonPackage rec { dependencies = [ packaging - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 6b0469c80823..a51ae2bbd75e 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, isPyPy, distlib, fetchFromGitHub, @@ -57,7 +56,6 @@ buildPythonPackage rec { # Network access "test_seed_link_via_app_data" ] - ++ lib.optionals (pythonOlder "3.11") [ "test_help" ] ++ lib.optionals isPyPy [ # encoding problems "test_bash" diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix index c03c83595a59..2697107a10b0 100644 --- a/pkgs/development/python-modules/vulture/default.nix +++ b/pkgs/development/python-modules/vulture/default.nix @@ -5,10 +5,8 @@ pint, pytest-cov-stub, pytestCheckHook, - pythonOlder, setuptools, toml, - tomli, }: buildPythonPackage rec { @@ -23,8 +21,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = lib.optionals (pythonOlder "3.11") [ tomli ]; - nativeCheckInputs = [ pint pytest-cov-stub diff --git a/pkgs/development/python-modules/w1thermsensor/default.nix b/pkgs/development/python-modules/w1thermsensor/default.nix index f4868058e570..4a9f32a0edba 100644 --- a/pkgs/development/python-modules/w1thermsensor/default.nix +++ b/pkgs/development/python-modules/w1thermsensor/default.nix @@ -5,11 +5,9 @@ setuptools, aiofiles, click, - tomli, pytest-mock, pytest-asyncio, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -42,7 +40,6 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ] ++ lib.concatAttrValues optional-dependencies; pythonImportsCheck = [ "w1thermsensor" ]; diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix index 8d87dd524416..9f755f64a6f7 100644 --- a/pkgs/development/python-modules/weblate-language-data/default.nix +++ b/pkgs/development/python-modules/weblate-language-data/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "weblate-language-data"; - version = "2026.1"; + version = "2026.2"; pyproject = true; src = fetchPypi { pname = "weblate_language_data"; inherit version; - hash = "sha256-qImbiZzsNk3oSljSwdsK+uk/1ZUygwltTCkGNKxBeN4="; + hash = "sha256-0mGkNbJomRRzS9P3fuUUGl7uipAfZhesoyc7t+Ymyf4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index ca81336e0d20..237f4d9fb994 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -5,7 +5,6 @@ fetchFromGitHub, unittestCheckHook, pythonAtLeast, - pythonOlder, setuptools, werkzeug, }: @@ -38,10 +37,6 @@ buildPythonPackage rec { ++ lib.optionals (pythonAtLeast "3.13") [ # https://github.com/python-websockets/websockets/issues/1569 "test_writing_in_send_context_fails" - ] - ++ lib.optionals (pythonOlder "3.11") [ - # Our Python 3.10 and older raise SSLError instead of SSLCertVerificationError - "test_reject_invalid_server_certificate" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/whool/default.nix b/pkgs/development/python-modules/whool/default.nix index 2d040d4dcf72..229615d56113 100644 --- a/pkgs/development/python-modules/whool/default.nix +++ b/pkgs/development/python-modules/whool/default.nix @@ -6,8 +6,6 @@ lib, manifestoo-core, pytestCheckHook, - pythonOlder, - tomli, wheel, }: @@ -28,8 +26,7 @@ buildPythonPackage rec { dependencies = [ manifestoo-core wheel - ] - ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + ]; pythonImportsCheck = [ "whool" ]; diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 7fcd69029332..eba545151ebe 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -14,7 +14,6 @@ pytest-cov-stub, pytest-xdist, pytestCheckHook, - pythonOlder, typer, yarl, zeroconf, @@ -25,8 +24,6 @@ buildPythonPackage rec { version = "0.21.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "frenck"; repo = "python-wled"; diff --git a/pkgs/development/python-modules/xarray-dataclass/default.nix b/pkgs/development/python-modules/xarray-dataclass/default.nix index c55b3e974e2b..c4e47a2a39b0 100644 --- a/pkgs/development/python-modules/xarray-dataclass/default.nix +++ b/pkgs/development/python-modules/xarray-dataclass/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, hatchling, pytestCheckHook, numpy, diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index ce462aba7332..e2d8746c25d4 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system setuptools, @@ -41,8 +40,6 @@ buildPythonPackage rec { version = "2025.12.0"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "pydata"; repo = "xarray"; diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index 8054520520d9..ddceea21ff0d 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, which, setuptools, diff --git a/pkgs/development/python-modules/xnatpy/default.nix b/pkgs/development/python-modules/xnatpy/default.nix index c96b0f87fd63..9a73b35d35fa 100644 --- a/pkgs/development/python-modules/xnatpy/default.nix +++ b/pkgs/development/python-modules/xnatpy/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, hatchling, versioningit, click, diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix index 048b48436e2e..ec620caedb6d 100644 --- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix +++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, poetry-core, - pythonOlder, requests, }: @@ -12,8 +11,6 @@ buildPythonPackage rec { version = "0.4.3"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "domwillcode"; repo = "yale-smart-alarm-client"; diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index 0f5dd64cf846..8f1e44e38a4c 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -1,12 +1,10 @@ { lib, - async-timeout, buildPythonPackage, fetchFromGitLab, flit-core, ifaddr, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -23,7 +21,7 @@ buildPythonPackage rec { build-system = [ flit-core ]; - dependencies = [ ifaddr ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; + dependencies = [ ifaddr ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index b25b93bc1c05..a5ca2aba1590 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -1,7 +1,6 @@ { lib, cython, - async-timeout, buildPythonPackage, fetchFromGitHub, ifaddr, @@ -10,7 +9,6 @@ pytest-codspeed, pytest-cov-stub, pytest-timeout, - pythonOlder, pytestCheckHook, setuptools, }: @@ -33,7 +31,7 @@ buildPythonPackage rec { setuptools ]; - dependencies = [ ifaddr ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; + dependencies = [ ifaddr ]; nativeCheckInputs = [ pytest-asyncio diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix index b391ab3a2ff0..51f8b9c3958a 100644 --- a/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/pkgs/development/python-modules/zigpy-cc/default.nix @@ -6,7 +6,6 @@ pyserial-asyncio, pytest-asyncio, pytestCheckHook, - pythonOlder, zigpy, }: @@ -31,7 +30,7 @@ buildPythonPackage rec { zigpy ]; - doCheck = pythonOlder "3.11"; # asynctest is unsupported on python3.11 + doCheck = false; # asynctest unsupported on 3.11+ nativeCheckInputs = [ asynctest diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index ce72e4f7a79a..11e2fce0a079 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -1,6 +1,5 @@ { lib, - async-timeout, buildPythonPackage, coloredlogs, fetchFromGitHub, @@ -11,7 +10,6 @@ pytest-timeout, pytest-xdist, pytestCheckHook, - pythonOlder, setuptools, voluptuous, zigpy, @@ -43,9 +41,6 @@ buildPythonPackage rec { jsonschema voluptuous zigpy - ] - ++ lib.optionals (pythonOlder "3.11") [ - async-timeout ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index a52daca2aea7..7c69f2fee5f7 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -4,7 +4,6 @@ aiohttp, aioresponses, aiosqlite, - async-timeout, attrs, buildPythonPackage, crccheck, @@ -18,7 +17,6 @@ pytest-asyncio_0, pytest-timeout, pytestCheckHook, - pythonOlder, setuptools, typing-extensions, voluptuous, @@ -55,8 +53,7 @@ buildPythonPackage rec { pyserial-asyncio-fast typing-extensions voluptuous - ] - ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; + ]; nativeCheckInputs = [ aioresponses diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix index 16163ea3de5a..38d6b5c705c0 100644 --- a/pkgs/development/python-modules/zm-py/default.nix +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, poetry-core, pytestCheckHook, - pythonOlder, requests, }: @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "0.5.4"; pyproject = true; - disabled = pythonOlder "3.11"; - src = fetchFromGitHub { owner = "rohankapoorcom"; repo = "zm-py"; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index dc31c76a8eb0..565694bf71c1 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -445,12 +445,12 @@ in lazy-restore = mkTmuxPlugin rec { pluginName = "lazy-restore"; rtpFilePath = "tmux-lazy-restore.tmux"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "bcampolo"; repo = "tmux-lazy-restore"; tag = "v${version}"; - hash = "sha256-rI9KhV6CiAHTErOKuTla+xVbpiP8RK9wu6goxCKhKiA="; + hash = "sha256-LLXGXJzIB2I0NMbWTh2DtLTAyC+JMzNM//SbKtFd9nM="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix index b22b3720ac74..997baca15cb0 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "advanced-camera-card"; - version = "7.27.0"; + version = "7.27.2"; src = fetchzip { url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip"; - hash = "sha256-t41bbAqQOuGhUJ3Tu0uh9FsBzc09iJylghQkqt6632k="; + hash = "sha256-NNWjDV0tKtFHkg2Zob86J0rtTYV/LKwhNTL8cvqS+Ns="; }; # TODO: build from source once yarn berry support lands in nixpkgs diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e8a0b4d23529..75954b5e9fd2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1609,7 +1609,6 @@ mapAliases { pyo3-pack = throw "'pyo3-pack' has been renamed to/replaced by 'maturin'"; # Converted to throw 2025-10-27 pypolicyd-spf = throw "'pypolicyd-spf' has been renamed to/replaced by 'spf-engine'"; # Converted to throw 2025-10-27 python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 - python310Full = throw "python310Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 python312Full = throw "python312Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a94026e35cb5..988eb5fe843e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5254,7 +5254,6 @@ with pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { }; inherit (pythonInterpreters) python27 - python310 python311 python312 python313 @@ -5271,7 +5270,6 @@ with pkgs; # Python package sets. python27Packages = python27.pkgs; - python310Packages = python310.pkgs; python311Packages = python311.pkgs; python312Packages = python312.pkgs; python313Packages = recurseIntoAttrs python313.pkgs; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 84d9ad354c03..eb097db646e8 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -38,13 +38,11 @@ mapAliases { python2Packages = throw "do not use python2Packages when building Python packages, specify each used package as a separate argument"; # do not remove python27Packages = throw "do not use python27Packages when building Python packages, specify each used package as a separate argument"; # do not remove python3Packages = throw "do not use python3Packages when building Python packages, specify each used package as a separate argument"; # do not remove - python310Packages = throw "do not use python310Packages when building Python packages, specify each used package as a separate argument"; # do not remove python311Packages = throw "do not use python311Packages when building Python packages, specify each used package as a separate argument"; # do not remove python312Packages = throw "do not use python312Packages when building Python packages, specify each used package as a separate argument"; # do not remove python313Packages = throw "do not use python313Packages when building Python packages, specify each used package as a separate argument"; # do not remove python2 = throw "do not use python2 when building Python packages, use the generic python parameter instead"; # do not remove python3 = throw "do not use python3 when building Python packages, use the generic python parameter instead"; # do not remove - python310 = throw "do not use python310 when building Python packages, use the generic python parameter instead"; # do not remove python311 = throw "do not use python311 when building Python packages, use the generic python parameter instead"; # do not remove python312 = throw "do not use python312 when building Python packages, use the generic python parameter instead"; # do not remove python313 = throw "do not use python313 when building Python packages, use the generic python parameter instead"; # do not remove