From 14a12caecffdba81e6ccba5cba9cd3b38cb4571e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 2 Feb 2024 12:10:19 +0100 Subject: python38: remove The end of life for Python 3.8 is scheduled for 2024/10. As such it cannot be a part of NixOS 24.05, because its support cycle goes past that. --- doc/languages-frameworks/python.section.md | 2 -- pkgs/development/compilers/gcc-arm-embedded/11/default.nix | 8 ++++---- pkgs/development/compilers/gcc-arm-embedded/12/default.nix | 8 ++++---- pkgs/development/compilers/gcc-arm-embedded/13/default.nix | 8 ++++---- pkgs/development/interpreters/python/default.nix | 13 ------------- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 4 ++-- pkgs/top-level/all-packages.nix | 13 +++---------- 7 files changed, 17 insertions(+), 39 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 6634dced6eb72..4938d3c966163 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -7,7 +7,6 @@ | Package | Aliases | Interpreter | |------------|-----------------|-------------| | python27 | python2, python | CPython 2.7 | -| python38 | | CPython 3.8 | | python39 | | CPython 3.9 | | python310 | | CPython 3.10 | | python311 | python3 | CPython 3.11 | @@ -60,7 +59,6 @@ sets are * `pkgs.python27Packages` * `pkgs.python3Packages` -* `pkgs.python38Packages` * `pkgs.python39Packages` * `pkgs.python310Packages` * `pkgs.python311Packages` diff --git a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix index ad132f5bbf6cf..4ed1ac9b99b01 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses5 -, python38 +, python39 , libxcrypt-legacy , runtimeShell }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true done ''; @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped cat < $out/bin/arm-none-eabi-gdb #!${runtimeShell} - export PYTHONPATH=${python38}/lib/python3.8 - export PYTHONHOME=${python38}/bin/python3.8 + export PYTHONPATH=${python39}/lib/python3.9 + export PYTHONHOME=${python39.interpreter} exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" EOF chmod +x $out/bin/arm-none-eabi-gdb diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix index 8f18579f93f63..0407cfa71e09c 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses5 -, python38 +, python39 , libxcrypt-legacy , runtimeShell }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true done ''; @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped cat < $out/bin/arm-none-eabi-gdb #!${runtimeShell} - export PYTHONPATH=${python38}/lib/python3.8 - export PYTHONHOME=${python38}/bin/python3.8 + export PYTHONPATH=${python39}/lib/python3.9 + export PYTHONHOME=${python39.interpreter} exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" EOF chmod +x $out/bin/arm-none-eabi-gdb diff --git a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix index 14d7d215a00d3..a16348dad02c7 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses5 -, python38 +, python39 , libxcrypt-legacy , runtimeShell }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true done ''; @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped cat < $out/bin/arm-none-eabi-gdb #!${runtimeShell} - export PYTHONPATH=${python38}/lib/python3.8 - export PYTHONHOME=${python38}/bin/python3.8 + export PYTHONPATH=${python39}/lib/python3.9 + export PYTHONHOME=${python39.interpreter} exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" EOF chmod +x $out/bin/arm-none-eabi-gdb diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 95d2ca33558d3..12050f319fc0b 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -42,19 +42,6 @@ in { inherit passthruFun; }; - python38 = callPackage ./cpython { - self = __splicedPackages.python38; - sourceVersion = { - major = "3"; - minor = "8"; - patch = "18"; - suffix = ""; - }; - hash = "sha256-P/txzTSaMmunsvrcfn34a6V33ZxJF+UqhAGtvadAXj8="; - inherit (darwin) configd; - inherit passthruFun; - }; - python39 = callPackage ./cpython { self = __splicedPackages.python39; sourceVersion = { diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 9c5d347d110b0..bd05954ddb35d 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -2,7 +2,7 @@ , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel , fontconfig, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake -, bison, flex, gdb, gperf, perl, pkg-config, python38, ruby +, bison, flex, gdb, gperf, perl, pkg-config, python3, ruby , ICU, OpenGL }: @@ -26,7 +26,7 @@ qtModule { ++ lib.optional stdenv.isDarwin qtmultimedia; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ] ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ]; - nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python38 ruby cmake ]; + nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python3 ruby cmake ]; cmakeFlags = [ "-DPORT=Qt" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d41b1143bf1f7..71326224b1a92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8718,7 +8718,7 @@ with pkgs; google-clasp = callPackage ../development/tools/google-clasp { }; - google-compute-engine = with python38.pkgs; toPythonApplication google-compute-engine; + google-compute-engine = with python3.pkgs; toPythonApplication google-compute-engine; google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; @@ -17708,12 +17708,6 @@ with pkgs; bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; x11Support = true; }; - python38Full = python38.override { - self = python38Full; - pythonAttr = "python38Full"; - bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - x11Support = true; - }; python39Full = python39.override { self = python39Full; pythonAttr = "python39Full"; @@ -17746,13 +17740,12 @@ with pkgs; }; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python313 python3Minimal pypy27 pypy310 pypy39 rustpython; + inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python3Minimal pypy27 pypy310 pypy39 rustpython; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; # Python package sets. python27Packages = python27.pkgs // { __attrsFailEvaluation = true; }; - python38Packages = python38.pkgs // { __attrsFailEvaluation = true; }; python39Packages = python39.pkgs // { __attrsFailEvaluation = true; }; python310Packages = python310.pkgs // { __attrsFailEvaluation = true; }; python311Packages = recurseIntoAttrs python311.pkgs // { pythonPackages = python311.pkgs // { __attrsFailEvaluation = true; }; }; @@ -25179,7 +25172,7 @@ with pkgs; vale = callPackage ../tools/text/vale { }; valhalla = callPackage ../development/libraries/valhalla { - boost = boost.override { enablePython = true; python = python38; }; + boost = boost.override { enablePython = true; python = python3; }; protobuf = protobuf_21.override { abseil-cpp = abseil-cpp_202103.override { cxxStandard = "17"; -- cgit 1.4.1