Merge pull request #145084 from prusnak/gcc-arm-embedded

authored by

Sandro and committed by
GitHub
5be0c169 1d62b00a

+11 -7
+8 -6
pkgs/development/compilers/gcc-arm-embedded/10/default.nix
··· 8 8 stdenv.mkDerivation rec { 9 9 pname = "gcc-arm-embedded"; 10 10 version = "10.3.1"; 11 - release = "10.3-2021.07"; 11 + release = "10.3-2021.10"; 12 12 13 13 suffix = { 14 + aarch64-darwin = "mac"; # use intel binaries via rosetta 14 15 aarch64-linux = "aarch64-linux"; 15 - x86_64-darwin = "mac-10.14.6"; 16 + x86_64-darwin = "mac"; 16 17 x86_64-linux = "x86_64-linux"; 17 18 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); 18 19 19 20 src = fetchurl { 20 21 url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${release}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; 21 22 sha256 = { 22 - aarch64-linux = "0y4nyrff5bq90v44z2h90gqgl18bs861i9lygx4z89ym85jycx9s"; 23 - x86_64-darwin = "1r3yidmgx1xq1f19y2c5njf2g95vs9cssmmsxsb68qm192r58i8a"; 24 - x86_64-linux = "1skcalz1sr0hhpjcl8qjsqd16n2w0zrbnlrbr8sx0g728kiqsnwc"; 23 + aarch64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv"; 24 + aarch64-linux = "020j8gkzc0i0b74vz98gvngnwjm5222j1gk5nswfk6587krba1gn"; 25 + x86_64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv"; 26 + x86_64-linux = "18y92vpl22hf74yqdvmpw8adrkl92s4crzzs6avm05md37qb9nwp"; 25 27 }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); 26 28 }; 27 29 ··· 49 51 homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; 50 52 license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; 51 53 maintainers = with maintainers; [ prusnak ]; 52 - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; 54 + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; 53 55 }; 54 56 }
+3 -1
pkgs/development/compilers/gcc-arm-embedded/9/default.nix
··· 12 12 subdir = "9-2020q2"; 13 13 14 14 suffix = { 15 + aarch64-darwin = "mac"; # use intel binaries via rosetta 15 16 aarch64-linux = "aarch64-linux"; 16 17 x86_64-darwin = "mac"; 17 18 x86_64-linux = "x86_64-linux"; ··· 20 21 src = fetchurl { 21 22 url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; 22 23 sha256 = { 24 + aarch64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; 23 25 aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z"; 24 26 x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; 25 27 x86_64-linux = "07zi2yr5gvhpbij5pnj49zswb9g2gw7zqp4xwwniqmq477h2xp2s"; ··· 50 52 homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; 51 53 license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; 52 54 maintainers = with maintainers; [ prusnak ]; 53 - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; 55 + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; 54 56 }; 55 57 }