diff options
| author | Jack Henahan <jhenahan@me.com> | 2018-09-25 18:16:35 -0400 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2018-09-25 15:16:35 -0700 |
| commit | 2b23072c3438ea2a8a8477f738d24be2bc9aacdc (patch) | |
| tree | bffde22ed40aa494ce385b62ef09f1de1cef2f09 | |
| parent | 9dc19fdb6d0fedfb0080891a8eff49a8fc3b70c2 (diff) | |
| download | qmk_firmware-2b23072c3438ea2a8a8477f738d24be2bc9aacdc.tar.gz qmk_firmware-2b23072c3438ea2a8a8477f738d24be2bc9aacdc.zip | |
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
| -rw-r--r-- | shell.nix | 7 | ||||
| -rwxr-xr-x | util/linux_install.sh | 4 |
2 files changed, 10 insertions, 1 deletions
@@ -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 { diff --git a/util/linux_install.sh b/util/linux_install.sh index d5da59e827..9b8b92d087 100755 --- a/util/linux_install.sh +++ b/util/linux_install.sh @@ -10,7 +10,9 @@ elif grep ID /etc/os-release | grep -q debian; then dfu-programmer dfu-util gcc-arm-none-eabi binutils-arm-none-eabi \ libnewlib-arm-none-eabi elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then - sudo pacman -S gcc unzip wget zip avr-gcc avr-binutils avr-libc \ + # install avr-gcc 8.1 until 8.3 is available. See #3657 for details of the bug. + sudo pacman -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.1.0-1-x86_64.pkg.tar.xz + sudo pacman -S gcc unzip wget zip avr-binutils avr-libc \ dfu-util arm-none-eabi-gcc arm-none-eabi-binutils \ arm-none-eabi-newlib git clone https://aur.archlinux.org/dfu-programmer.git /tmp/dfu-programmer |