Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 77f77648657b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a909bb490169
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 4, 2019

  1. gcc-arm-embedded: add darwin support

    @witkamp
    witkamp committed Apr 4, 2019
    Copy the full SHA
    daf1f0b View commit details

Commits on Apr 5, 2019

  1. Merge pull request #58972 from witkamp/master 

    gcc-arm-embedded: add darwin support
    @matthewbauer
    matthewbauer authored Apr 5, 2019
    Copy the full SHA
    a909bb4 View commit details
19 changes: 10 additions & 9 deletions pkgs/development/compilers/gcc-arm-embedded/6/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,16 +5,17 @@ stdenv.mkDerivation rec {
version = "6-2017-q2-update";
subdir = "6-2017q2";

platformString =
if stdenv.isLinux then "linux"
else if stdenv.isDarwin then "mac"
else throw "unsupported platform";

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

src =
if stdenv.isLinux then fetchurl { url=urlString; sha256="1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; }
else if stdenv.isDarwin then fetchurl { url=urlString; sha256="0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; }
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";

phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
15 changes: 12 additions & 3 deletions pkgs/development/compilers/gcc-arm-embedded/7/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,9 +7,18 @@ stdenv.mkDerivation rec {
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"; };
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";

phases = [ "unpackPhase" "installPhase" "fixupPhase" ];

15 changes: 12 additions & 3 deletions pkgs/development/compilers/gcc-arm-embedded/8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,9 +7,18 @@ stdenv.mkDerivation rec {
version = "8-2018-q4-major";
subdir = "8-2018q4";

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

src = fetchurl { url=urlString; sha256="fb31fbdfe08406ece43eef5df623c0b2deb8b53e405e2c878300f7a1f303ee52"; };
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="fb31fbdfe08406ece43eef5df623c0b2deb8b53e405e2c878300f7a1f303ee52";
}
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="0q44r57fizpk1z3ngcjwal3rxgsnzjyfknpgwlwzmw5r9p98wlhb";
}
else throw "unsupported platform";

phases = [ "unpackPhase" "installPhase" "fixupPhase" ];