From 2b23072c3438ea2a8a8477f738d24be2bc9aacdc Mon Sep 17 00:00:00 2001 From: Jack Henahan Date: Tue, 25 Sep 2018 18:16:35 -0400 Subject: Pin avr-gcc in shell.nix pending release of 8.3.0 (#3922) * Pin avr-gcc in shell.nix pending release of 8.3.0 There's apparently a critical bug in 8.2.0, which is now the nixpkgs default. This change overrides that default in favor of the known good version. Once 8.3.0 is the default, the override can be dropped. * Arch/Manjaro fix --- shell.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'shell.nix') diff --git a/shell.nix b/shell.nix index 715414f96..67efb46b7 100644 --- a/shell.nix +++ b/shell.nix @@ -13,6 +13,13 @@ let "-B${avrlibc}/avr/lib/avr51" "-L${avrlibc}/avr/lib/avr51" ]; + avrgcc = pkgs.avrgcc.overrideAttrs (oldAttrs: rec { + name = "avr-gcc-8.1.0"; + src = fetchurl { + url = "mirror://gcc/releases/gcc-8.1.0/gcc-8.1.0.tar.xz"; + sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x"; + }; + }); in stdenv.mkDerivation { -- cgit v1.2.3-70-g09d2 From 5e52eda0cacd45d2daa63dce71d7b7ceb5953368 Mon Sep 17 00:00:00 2001 From: Michishige Kaito Date: Thu, 20 Dec 2018 22:55:13 +0000 Subject: shell.nix: Packages relocated in upstream cleanup --- shell.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'shell.nix') diff --git a/shell.nix b/shell.nix index 67efb46b7..6ff8a7ad2 100644 --- a/shell.nix +++ b/shell.nix @@ -4,6 +4,10 @@ with pkgs; let + avrbinutils = pkgsCross.avr.buildPackages.binutils; + avrlibc = pkgsCross.avr.libcCross; + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + avr_incflags = [ "-isystem ${avrlibc}/avr/include" "-B${avrlibc}/avr/lib/avr5" @@ -13,7 +17,7 @@ let "-B${avrlibc}/avr/lib/avr51" "-L${avrlibc}/avr/lib/avr51" ]; - avrgcc = pkgs.avrgcc.overrideAttrs (oldAttrs: rec { + avrgcc = pkgsCross.avr.buildPackages.gcc.overrideAttrs (oldAttrs: rec { name = "avr-gcc-8.1.0"; src = fetchurl { url = "mirror://gcc/releases/gcc-8.1.0/gcc-8.1.0.tar.xz"; -- cgit v1.2.3-70-g09d2