diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-03 17:29:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-03 17:29:25 +0100 |
commit | 50a306125cd04579c7129061bd577a8ab7b8f5b4 (patch) | |
tree | e17268d9c0f4af98a2e242bededc36571e3c98c1 /pkgs/top-level/all-packages.nix | |
parent | c5d4957103801c04699bf2ce574af5e42f51dc8b (diff) | |
parent | b3531b9719f37de1c25c40192399b34dba4e0494 (diff) | |
download | nixlib-50a306125cd04579c7129061bd577a8ab7b8f5b4.tar nixlib-50a306125cd04579c7129061bd577a8ab7b8f5b4.tar.gz nixlib-50a306125cd04579c7129061bd577a8ab7b8f5b4.tar.bz2 nixlib-50a306125cd04579c7129061bd577a8ab7b8f5b4.tar.lz nixlib-50a306125cd04579c7129061bd577a8ab7b8f5b4.tar.xz nixlib-50a306125cd04579c7129061bd577a8ab7b8f5b4.tar.zst nixlib-50a306125cd04579c7129061bd577a8ab7b8f5b4.zip |
Merge pull request #47542 from prusnak/gcc-arm-embedded_update
gcc-arm-embedded: 6-2017-q2-update -> 7-2018-q2-update
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee96d4424db2..f5445de13ea2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6761,7 +6761,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 {}; |