From dcdf00f18bcdd5938deb7023ebaee45665f6eda2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 19 Oct 2018 11:55:07 -0500 Subject: [PATCH] mentorToolchains: remove mentorToolchains.armLinuxGnuEabi is replaced with: - pkgsCross.pogoplug4.buildPackages.gcc - pkgsCross.pogoplug4.buildPackages.binutils and mentorToolchains.armEabi is replaced with: - pkgsCross.arm-embedded.buildPackages.gcc - pkgsCross.arm-embedded.buildPackages.binutils Fixes #39087 --- pkgs/development/compilers/mentor/default.nix | 80 ------------------- pkgs/top-level/all-packages.nix | 4 - 2 files changed, 84 deletions(-) delete mode 100644 pkgs/development/compilers/mentor/default.nix diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix deleted file mode 100644 index 4f09df7f2ea..00000000000 --- a/pkgs/development/compilers/mentor/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -# Sourcery CodeBench Lite toolchain(s) (GCC) from Mentor Graphics - -{ stdenv, fetchurl, patchelf, ncurses }: - -let - - buildToolchain = - { name, src, description }: - - stdenv.mkDerivation rec { - inherit name src; - - nativeBuildInputs = [ patchelf ]; - - buildCommand = '' - # Unpack tarball - mkdir -p "$out" - tar --strip-components=1 -xjf "$src" -C "$out" - - # Patch binaries - interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" - for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do - # Skip non-executable files - case "$file" in - *README.txt) echo "skipping $file"; continue;; - *liblto_plugin.so*) echo "skipping $file"; continue;; - esac - - # Skip directories - test -d "$file" && continue - - echo "patchelf'ing $file" - patchelf --set-interpreter "$interpreter" "$file" - - # GDB needs ncurses - case "$file" in - *gdb) patchelf --set-rpath "${ncurses.out}/lib" "$file";; - esac - done - - # Manpages - mkdir -p "$out/share/man" - ln -s "$out"/share/doc/*/man/man1 "$out/share/man/man1" - ln -s "$out"/share/doc/*/man/man7 "$out/share/man/man7" - ''; - - meta = with stdenv.lib; { - inherit description; - homepage = https://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; - }; - -in - -{ - - armLinuxGnuEabi = let version = "2013.05-24"; in buildToolchain rec { - name = "sourcery-codebench-lite-arm-linux-gnueabi-${version}"; - description = "Sourcery CodeBench Lite toolchain (GCC) for ARM GNU/Linux, from Mentor Graphics"; - src = fetchurl { - url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${version}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"; - sha256 = "1xb075ia61c59cya2jl8zp4fvqpfnwkkc5330shvgdlg9981qprr"; - }; - }; - - armEabi = let version = "2013.05-23"; in buildToolchain rec { - name = "sourcery-codebench-lite-arm-eabi-${version}"; - description = "Sourcery CodeBench Lite toolchain (GCC) for ARM EABI, from Mentor Graphics"; - src = fetchurl { - url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-${version}-arm-none-eabi-i686-pc-linux-gnu.tar.bz2"; - sha256 = "0nbvdwj3kcv9scx808gniqp0ncdiy2i7afmdvribgkz1lsfin923"; - }; - }; - - # TODO: Sourcery CodeBench is also available for MIPS, Power, SuperH, - # ColdFire (and more). -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f130c470513..18850ea49cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7178,10 +7178,6 @@ with pkgs; manticore = callPackage ../development/compilers/manticore { }; - mentorToolchains = recurseIntoAttrs ( - pkgsi686Linux.callPackage ../development/compilers/mentor {} - ); - mercury = callPackage ../development/compilers/mercury { }; microscheme = callPackage ../development/compilers/microscheme { };