Unverified Commit 05cbf47a authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #285779 from mweinelt/python38-removal 

python38: remove
parents 75b569f0 14a12cae

doc/languages-frameworks/python.section.md

+0 −2
Original line number Diff line number Diff line
@@ -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`

pkgs/development/compilers/gcc-arm-embedded/11/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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 <<EOF > $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

pkgs/development/compilers/gcc-arm-embedded/12/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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 <<EOF > $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

pkgs/development/compilers/gcc-arm-embedded/13/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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 <<EOF > $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

pkgs/development/interpreters/python/default.nix

+0 −13
Original line number Diff line number Diff line
@@ -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 = {