pyrox.dev / nixpkgs
lol
fork atom

gcc-arm-embedded: remove dependency on ancient Python (#398190)

authored by Pavol Rusnak and committed by GitHub 439e0a24 b7e09449

+20 -54
unified split
+1 -1
pkgs/by-name/gc/gcc-arm-embedded-10/package.nix
··· 40 40 ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man 41 41 ''; 42 42 43 - preFixup = '' 43 + preFixup = lib.optionalString stdenv.isLinux '' 44 44 find $out -type f | while read f; do 45 45 patchelf "$f" > /dev/null 2>&1 || continue 46 46 patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
+7 -16
pkgs/by-name/gc/gcc-arm-embedded-11/package.nix
··· 3 3 stdenv, 4 4 fetchurl, 5 5 ncurses5, 6 - python39, 7 6 libxcrypt-legacy, 8 - runtimeShell, 9 7 }: 10 8 11 9 stdenv.mkDerivation rec { ··· 39 37 installPhase = '' 40 38 mkdir -p $out 41 39 cp -r * $out 40 + # these binaries require ancient Python 3.8 not available in Nixpkgs 41 + rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || : 42 42 ''; 43 43 44 - preFixup = '' 44 + preFixup = lib.optionalString stdenv.isLinux '' 45 45 find $out -type f | while read f; do 46 46 patchelf "$f" > /dev/null 2>&1 || continue 47 47 patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true ··· 50 50 "$out" 51 51 stdenv.cc.cc 52 52 ncurses5 53 - python39 54 53 libxcrypt-legacy 55 54 ] 56 55 } "$f" || true 57 56 done 58 57 ''; 59 58 60 - postFixup = '' 61 - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped 62 - cat <<EOF > $out/bin/arm-none-eabi-gdb 63 - #!${runtimeShell} 64 - export PYTHONPATH=${python39}/lib/python3.9 65 - export PYTHONHOME=${python39.interpreter} 66 - exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" 67 - EOF 68 - chmod +x $out/bin/arm-none-eabi-gdb 69 - ''; 70 - 71 59 meta = with lib; { 72 60 description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; 73 61 homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; ··· 79 67 lgpl3 80 68 mit 81 69 ]; 82 - maintainers = with maintainers; [ prusnak ]; 70 + maintainers = with maintainers; [ 71 + prusnak 72 + prtzl 73 + ]; 83 74 platforms = [ 84 75 "x86_64-linux" 85 76 "aarch64-linux"
+3 -15
pkgs/by-name/gc/gcc-arm-embedded-12/package.nix
··· 3 3 stdenv, 4 4 fetchurl, 5 5 ncurses5, 6 - python39, 7 6 libxcrypt-legacy, 8 - runtimeShell, 9 7 }: 10 8 11 9 stdenv.mkDerivation rec { ··· 41 39 installPhase = '' 42 40 mkdir -p $out 43 41 cp -r * $out 42 + # these binaries require ancient Python 3.8 not available in Nixpkgs 43 + rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || : 44 44 ''; 45 45 46 - preFixup = '' 46 + preFixup = lib.optionalString stdenv.isLinux '' 47 47 find $out -type f | while read f; do 48 48 patchelf "$f" > /dev/null 2>&1 || continue 49 49 patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true ··· 52 52 "$out" 53 53 stdenv.cc.cc 54 54 ncurses5 55 - python39 56 55 libxcrypt-legacy 57 56 ] 58 57 } "$f" || true 59 58 done 60 - ''; 61 - 62 - postFixup = '' 63 - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped 64 - cat <<EOF > $out/bin/arm-none-eabi-gdb 65 - #!${runtimeShell} 66 - export PYTHONPATH=${python39}/lib/python3.9 67 - export PYTHONHOME=${python39.interpreter} 68 - exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" 69 - EOF 70 - chmod +x $out/bin/arm-none-eabi-gdb 71 59 ''; 72 60 73 61 meta = with lib; {
+3 -15
pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
··· 3 3 stdenv, 4 4 fetchurl, 5 5 ncurses5, 6 - python39, 7 6 libxcrypt-legacy, 8 - runtimeShell, 9 7 }: 10 8 11 9 stdenv.mkDerivation rec { ··· 42 40 installPhase = '' 43 41 mkdir -p $out 44 42 cp -r * $out 43 + # these binaries require ancient Python 3.8 not available in Nixpkgs 44 + rm $out/bin/{arm-none-eabi-gdb-py,arm-none-eabi-gdb-add-index-py} || : 45 45 ''; 46 46 47 - preFixup = '' 47 + preFixup = lib.optionalString stdenv.isLinux '' 48 48 find $out -type f | while read f; do 49 49 patchelf "$f" > /dev/null 2>&1 || continue 50 50 patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true ··· 53 53 "$out" 54 54 stdenv.cc.cc 55 55 ncurses5 56 - python39 57 56 libxcrypt-legacy 58 57 ] 59 58 } "$f" || true 60 59 done 61 - ''; 62 - 63 - postFixup = '' 64 - mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped 65 - cat <<EOF > $out/bin/arm-none-eabi-gdb 66 - #!${runtimeShell} 67 - export PYTHONPATH=${python39}/lib/python3.9 68 - export PYTHONHOME=${python39.interpreter} 69 - exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" 70 - EOF 71 - chmod +x $out/bin/arm-none-eabi-gdb 72 60 ''; 73 61 74 62 meta = with lib; {
+2 -3
pkgs/by-name/gc/gcc-arm-embedded-14/package.nix
··· 4 4 fetchurl, 5 5 ncurses6, 6 6 libxcrypt-legacy, 7 - runtimeShell, 7 + xz, 8 8 zstd, 9 - xz, 10 9 }: 11 10 12 11 stdenv.mkDerivation rec { ··· 57 56 stdenv.cc.cc 58 57 ncurses6 59 58 libxcrypt-legacy 60 - zstd 61 59 xz 60 + zstd 62 61 ] 63 62 } "$f" || true 64 63 done
+1 -1
pkgs/by-name/gc/gcc-arm-embedded-6/package.nix
··· 39 39 ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man 40 40 ''; 41 41 42 - preFixup = '' 42 + preFixup = lib.optionalString stdenv.isLinux '' 43 43 find $out -type f | while read f; do 44 44 patchelf "$f" > /dev/null 2>&1 || continue 45 45 patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
+1 -1
pkgs/by-name/gc/gcc-arm-embedded-7/package.nix
··· 39 39 ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man 40 40 ''; 41 41 42 - preFixup = '' 42 + preFixup = lib.optionalString stdenv.isLinux '' 43 43 find $out -type f | while read f; do 44 44 patchelf "$f" > /dev/null 2>&1 || continue 45 45 patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
+1 -1
pkgs/by-name/gc/gcc-arm-embedded-8/package.nix
··· 39 39 ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man 40 40 ''; 41 41 42 - preFixup = '' 42 + preFixup = lib.optionalString stdenv.isLinux '' 43 43 find $out -type f | while read f; do 44 44 patchelf "$f" > /dev/null 2>&1 || continue 45 45 patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
+1 -1
pkgs/by-name/gc/gcc-arm-embedded-9/package.nix
··· 41 41 ln -s $out/share/doc/gcc-arm-none-eabi/man $out/man 42 42 ''; 43 43 44 - preFixup = '' 44 + preFixup = lib.optionalString stdenv.isLinux '' 45 45 find $out -type f | while read f; do 46 46 patchelf "$f" > /dev/null 2>&1 || continue 47 47 patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true