Unverified Commit 5b88d14a authored by Pavol Rusnak's avatar Pavol Rusnak
Browse files

gcc-arm-embedded: remove aarch64-darwin from platforms 

reverts c3557f2e
reverts 4c5fbc98

one can use gcc-arm-embedded on aarch64-darwin via pkgsx86_64Darwin
(introduced in #161657)
parent 987dc7ad

pkgs/development/compilers/gcc-arm-embedded/10/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec { 
  release = "10.3-2021.10";



  suffix = {

    aarch64-darwin = "mac";  # use intel binaries via rosetta

    aarch64-linux = "aarch64-linux";

    x86_64-darwin = "mac";

    x86_64-linux  = "x86_64-linux";
@@ -20,7 +19,6 @@ stdenv.mkDerivation rec { 
  src = fetchurl {

    url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${release}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";

    sha256 = {

      aarch64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv";

      aarch64-linux = "020j8gkzc0i0b74vz98gvngnwjm5222j1gk5nswfk6587krba1gn";

      x86_64-darwin = "0fr8pki2g4bfk1rk90dzwql37d0b71ngzs9zyx0g2jainan3sqgv";

      x86_64-linux  = "18y92vpl22hf74yqdvmpw8adrkl92s4crzzs6avm05md37qb9nwp";
@@ -51,6 +49,6 @@ stdenv.mkDerivation rec { 
    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" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];

    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];

  };

}

pkgs/development/compilers/gcc-arm-embedded/11/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ stdenv.mkDerivation rec { 
  version = "11.3.rel1";



  platform = {

    aarch64-darwin = "darwin-x86_64";  # use intel binaries via rosetta

    aarch64-linux = "aarch64";

    x86_64-darwin = "darwin-x86_64";

    x86_64-linux  = "x86_64";
@@ -19,7 +18,6 @@ stdenv.mkDerivation rec { 
  src = fetchurl {

    url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz";

    sha256 = {

      aarch64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2";

      aarch64-linux = "0pmm5r0k5mxd5drbn2s8a7qkm8c4fi8j5y31c70yrp0qs08kqwbc";

      x86_64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2";

      x86_64-linux  = "08b1w1zmj4z80k59zmlc1bf34lg8d7z65fwvp5ir2pb1d1zxh86l";
@@ -49,6 +47,6 @@ stdenv.mkDerivation rec { 
    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" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];

    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];

  };

}

pkgs/development/compilers/gcc-arm-embedded/6/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec { 
  subdir = "6-2017q2";



  suffix = {

    aarch64-darwin = "mac";  # use intel binaries via rosetta

    x86_64-darwin = "mac";

    x86_64-linux  = "linux";

  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -20,7 +19,6 @@ stdenv.mkDerivation rec { 
  src = fetchurl {

    url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";

    sha256 = {

      aarch64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x";

      x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x";

      x86_64-linux  = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6";

    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -50,6 +48,6 @@ stdenv.mkDerivation rec { 
    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" "aarch64-darwin" ];

    platforms = [ "x86_64-linux" "x86_64-darwin" ];

  };

}

pkgs/development/compilers/gcc-arm-embedded/7/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec { 
  subdir = "7-2018q2";



  suffix = {

    aarch64-darwin = "mac";  # use intel binaries via rosetta

    x86_64-darwin = "mac";

    x86_64-linux  = "linux";

  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -20,7 +19,6 @@ stdenv.mkDerivation rec { 
  src = fetchurl {

    url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";

    sha256 = {

      aarch64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61";

      x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61";

      x86_64-linux  = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv";

    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -50,6 +48,6 @@ stdenv.mkDerivation rec { 
    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" "aarch64-darwin" ];

    platforms = [ "x86_64-linux" "x86_64-darwin" ];

  };

}

pkgs/development/compilers/gcc-arm-embedded/8/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec { 
  subdir = "8-2019q3/RC1.1";



  suffix = {

    aarch64-darwin = "mac";  # use intel binaries via rosetta

    x86_64-darwin = "mac";

    x86_64-linux  = "linux";

  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -20,7 +19,6 @@ stdenv.mkDerivation rec { 
  src = fetchurl {

    url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2";

    sha256 = {

      aarch64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085";

      x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085";

      x86_64-linux  = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92";

    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -50,6 +48,6 @@ stdenv.mkDerivation rec { 
    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" "aarch64-darwin" ];

    platforms = [ "x86_64-linux" "x86_64-darwin" ];

  };

}