From fcba6a0619bafaaa15fef5c138c2f6c54a20ad6f Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 1 Dec 2019 18:42:16 +0100 Subject: gcc-arm-embedded: unify gcc-arm-embedded/{6,7,8,9}/default.nix --- .../compilers/gcc-arm-embedded/6/default.nix | 42 ++++++++++++---------- .../compilers/gcc-arm-embedded/7/default.nix | 40 +++++++++++---------- .../compilers/gcc-arm-embedded/8/default.nix | 40 +++++++++++---------- .../compilers/gcc-arm-embedded/9/default.nix | 31 ++++++++-------- 4 files changed, 79 insertions(+), 74 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 940dec0338ca..f635fce972f5 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -1,22 +1,26 @@ -{ stdenv, fetchurl, ncurses5, python27 }: +{ stdenv +, fetchurl +, ncurses5 +, python27 +}: stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; version = "6-2017-q2-update"; subdir = "6-2017q2"; - src = - if stdenv.isLinux then - fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; - sha256="1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; - } - else if stdenv.isDarwin then - fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2"; - sha256="0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; - } - else throw "unsupported platform"; + suffix = { + x86_64-darwin = "mac"; + x86_64-linux = "linux"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + sha256 = { + x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; + x86_64-linux = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; @@ -37,11 +41,11 @@ stdenv.mkDerivation rec { 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 stdenv.lib.licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with stdenv.lib.maintainers; [ vinymeuh ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + meta = with stdenv.lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + 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 = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index 90f9d5957bb3..4944038fde41 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -1,24 +1,26 @@ -{ stdenv, lib, fetchurl, ncurses5, python27 }: - -with lib; +{ stdenv +, fetchurl +, ncurses5 +, python27 +}: stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; version = "7-2018-q2-update"; subdir = "7-2018q2"; - src = - if stdenv.isLinux then - fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; - sha256="0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; - } - else if stdenv.isDarwin then - fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2"; - sha256="0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; - } - else throw "unsupported platform"; + suffix = { + x86_64-darwin = "mac"; + x86_64-linux = "linux"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + sha256 = { + x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; + x86_64-linux = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; @@ -39,11 +41,11 @@ stdenv.mkDerivation rec { 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; + meta = with stdenv.lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + 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; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index b2815cc71849..510889dad621 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -1,24 +1,26 @@ -{ stdenv, lib, fetchurl, ncurses5, python27 }: - -with lib; +{ stdenv +, fetchurl +, ncurses5 +, python27 +}: stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; version = "8-2019-q3-update"; subdir = "8-2019q3/RC1.1"; - src = - if stdenv.isLinux then - fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; - sha256="b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; - } - else if stdenv.isDarwin then - fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2"; - sha256="fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; - } - else throw "unsupported platform"; + suffix = { + x86_64-darwin = "mac"; + x86_64-linux = "linux"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + sha256 = { + x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; + x86_64-linux = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; @@ -39,11 +41,11 @@ stdenv.mkDerivation rec { 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; + meta = with stdenv.lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + 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; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index 02217b3a4617..8ded47d6e370 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -9,23 +9,20 @@ stdenv.mkDerivation rec { version = "9-2019-q4-major"; subdir = "9-2019q4/RC2.1"; - src = - if stdenv.system == "x86_64-linux" then - fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-x86_64-linux.tar.bz2"; - sha256="bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a"; - } - else if stdenv.system == "aarch64-linux" then - fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-aarch64-linux.tar.bz2"; - sha256="1f5b9309006737950b2218250e6bb392e2d68d4f1a764fe66be96e2a78888d83"; - } - else if stdenv.system == "x86_64-darwin" then - fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-mac.tar.bz2"; - sha256="1249f860d4155d9c3ba8f30c19e7a88c5047923cea17e0d08e633f12408f01f0"; - } - else throw "unsupported platform"; + suffix = { + aarch64-linux = "aarch64-linux"; + x86_64-darwin = "mac"; + x86_64-linux = "x86_64-linux"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + sha256 = { + aarch64-linux = "1f5b9309006737950b2218250e6bb392e2d68d4f1a764fe66be96e2a78888d83"; + x86_64-darwin = "1249f860d4155d9c3ba8f30c19e7a88c5047923cea17e0d08e633f12408f01f0"; + x86_64-linux = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; -- cgit 1.4.1