From 2877deb8526b39152310af2e1502f8f2e885eab3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 29 Aug 2025 02:02:07 +0200 Subject: [PATCH] python3Full: drop Bluetooth support is now built into the default build. The X11 support is realized outside the Python interpreter by including the tkinter module from the package set. --- doc/release-notes/rl-2511.section.md | 2 ++ pkgs/top-level/aliases.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 30 ---------------------------- 3 files changed, 8 insertions(+), 30 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 06a9af3df419..41138863701c 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -50,6 +50,8 @@ - `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67). +- `python3Full` and its versioned attributes (python3xxFull) have been removed. Bluetooth support is now enabled in the default python3 attributes. The X11 support built the tkinter module, which is available as a dedicated attribute on the package set. + - `stdenv.mkDerivation` and other derivation builders that use it no longer allow the value of `env` to be anything but an attribute set, for the purpose of setting environment variables that are available to the [builder](https://nix.dev/manual/nix/latest/store/derivation/#builder) process. An environment variable called `env` can still be provided by means of `mkDerivation { env.env = ...; }`, though we recommend to use a more specific name than "env". - The default Android NDK version has been raised to 27, and the default SDK version to 35. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8183554c6803..be16e2f86ef9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1985,6 +1985,12 @@ mapAliases { python = python2; # Added 2022-01-11 python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17 pythonFull = python2Full; # Added 2022-01-11 + python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; + python310Full = throw "python310Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; + python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; + python312Full = throw "python312Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; + python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; + python314Full = throw "python314Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; pythonPackages = python.pkgs; # Added 2022-01-11 pypy39 = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 135449988a43..3db91d436627 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6202,36 +6202,6 @@ with pkgs; pythonAttr = "python27Full"; x11Support = true; }; - python3Full = python3.override { - self = python3Full; - pythonAttr = "python3Full"; - bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - }; - python310Full = python310.override { - self = python310Full; - pythonAttr = "python310Full"; - bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - }; - python311Full = python311.override { - self = python311Full; - pythonAttr = "python311Full"; - bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - }; - python312Full = python312.override { - self = python312Full; - pythonAttr = "python312Full"; - bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - }; - python313Full = python313.override { - self = python313Full; - pythonAttr = "python313Full"; - bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - }; - python314Full = python314.override { - self = python314Full; - pythonAttr = "python314Full"; - bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - }; # https://py-free-threading.github.io python313FreeThreading = python313.override {