diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:50 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:50 +0200 |
commit | f02206d63d0e702e5d874162f91dd36614c31b2c (patch) | |
tree | 82f79c8dc3d5cf7108055155e6332f64485b0acf /pkgs/development/misc/avr | |
parent | 94e608d5877814bea7096d522524d937d6e82ad5 (diff) | |
parent | d9fa74ba7891cfae4a029ee79dd29e4ab3425385 (diff) | |
download | nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.tar nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.tar.gz nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.tar.bz2 nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.tar.lz nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.tar.xz nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.tar.zst nixlib-f02206d63d0e702e5d874162f91dd36614c31b2c.zip |
Merge staging into staging-next
Diffstat (limited to 'pkgs/development/misc/avr')
-rw-r--r-- | pkgs/development/misc/avr/binutils/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/misc/avr/gcc/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/misc/avr/binutils/default.nix b/pkgs/development/misc/avr/binutils/default.nix index 0826b83ed199..83ba93e63b76 100644 --- a/pkgs/development/misc/avr/binutils/default.nix +++ b/pkgs/development/misc/avr/binutils/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl }: let - version = "2.30"; + version = "2.31.1"; in stdenv.mkDerivation { name = "avr-binutils-${version}"; src = fetchurl { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; + sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; }; - configureFlags = "--target=avr --enable-languages=c,c++"; + configureFlags = [ "--target=avr" "--enable-languages=c,c++" ]; meta = with stdenv.lib; { description = "the GNU Binutils for AVR microcontrollers"; diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix index cce11616e2f1..5c9b56c99183 100644 --- a/pkgs/development/misc/avr/gcc/default.nix +++ b/pkgs/development/misc/avr/gcc/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, gmp, mpfr, libmpc, zlib, avrbinutils, texinfo }: let - version = "8.1.0"; + version = "8.2.0"; in stdenv.mkDerivation { name = "avr-gcc-${version}"; src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x"; + sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r"; }; patches = [ |