From f25d71940b53caa1c678f265dab290a2e307ecbb Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 1 Dec 2022 23:16:10 +0100 Subject: [PATCH] gcc-arm-embedded-{6,7,8,9,10}: drop python27 from dependencies python27 is only required for arm-none-eabi-gdb-py and since python27 is EOL, it's worth disabling python support for GDB, rather then breaking the whole gcc-arm-embedded --- pkgs/development/compilers/gcc-arm-embedded/10/default.nix | 3 +-- pkgs/development/compilers/gcc-arm-embedded/6/default.nix | 3 +-- pkgs/development/compilers/gcc-arm-embedded/7/default.nix | 3 +-- pkgs/development/compilers/gcc-arm-embedded/8/default.nix | 3 +-- pkgs/development/compilers/gcc-arm-embedded/9/default.nix | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix index 67d775eb7cd8..b10ac198430b 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -40,7 +39,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 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index a0d414d974f0..51f3c10f6735 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -39,7 +38,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 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 4df2a90f52ea..4d63f7c3ecdc 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -39,7 +38,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 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 152ecdb867d9..6673cb823485 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -39,7 +38,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 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index c625134508e3..841084904cf9 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , ncurses5 -, python27 }: stdenv.mkDerivation rec { @@ -41,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 python27 ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 ]} "$f" || true done '';