From b3531b9719f37de1c25c40192399b34dba4e0494 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 1 Oct 2018 21:12:54 +0200 Subject: [PATCH] gcc-arm-embedded: 6-2017-q2-update -> 7-2018-q2-update + update blackmagic to latest commit which includes gcc7 fixes --- maintainers/maintainer-list.nix | 5 +++ .../compilers/gcc-arm-embedded/7/default.nix | 39 +++++++++++++++++++ .../tools/misc/blackmagic/default.nix | 4 +- pkgs/top-level/all-packages.nix | 3 +- 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/gcc-arm-embedded/7/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3a535cbb3a9..f41027c7fb8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3304,6 +3304,11 @@ github = "proglodyte"; name = "Proglodyte"; }; + prusnak = { + email = "stick@gk2.sk"; + github = "prusnak"; + name = "Pavol Rusnak"; + }; pshendry = { email = "paul@pshendry.com"; github = "pshendry"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix new file mode 100644 index 00000000000..c22683dae03 --- /dev/null +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchurl, ncurses5, python27 }: + +with lib; + +stdenv.mkDerivation rec { + name = "gcc-arm-embedded-${version}"; + version = "7-2018-q2-update"; + subdir = "7-2018q2"; + + urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; + + src = fetchurl { url=urlString; sha256="0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; }; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out + cp -r * $out + ''; + + dontPatchELF = true; + dontStrip = true; + + preFixup = '' + 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 ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true + done + ''; + + meta = { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)"; + homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm; + license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; + maintainers = with maintainers; [ prusnak ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index 2d7225ee03e..2974c653acd 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "blacksphere"; repo = "blackmagic"; - rev = "d3a8f27fdbf952194e8fc5ce9b2fc9bcef7c545c"; - sha256 = "0c3l7cfqag3g7zrfn4mmikkx7076hb1r856ybhhdh0f6zji2j6jx"; + rev = "29386aee140e5e99a958727358f60980418b4c88"; + sha256 = "05x19y80mixk6blpnfpfngy5d41jpjvdqgjzkmhv1qc03bhyhc82"; fetchSubmodules = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e37008b1f1..2b1730a442d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6744,7 +6744,8 @@ with pkgs; ncurses = pkgsi686Linux.ncurses5; }; gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {}; - gcc-arm-embedded = gcc-arm-embedded-6; + gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {}; + gcc-arm-embedded = gcc-arm-embedded-7; gforth = callPackage ../development/compilers/gforth {};