From 72df7b4c191399c7835527b730647e079b6683ff Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@users.noreply.github.com>
Date: Tue, 16 Jul 2019 09:35:15 +0200
Subject: shell.nix: Downgrade gcc-arm-embedded (#5913)

Temporary fix for https://github.com/qmk/qmk_firmware/issues/5868
---
 shell.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'shell.nix')

diff --git a/shell.nix b/shell.nix
index 6ff8a7ad2d..e85221975d 100644
--- a/shell.nix
+++ b/shell.nix
@@ -6,7 +6,10 @@ with pkgs;
 let
   avrbinutils = pkgsCross.avr.buildPackages.binutils;
   avrlibc = pkgsCross.avr.libcCross;
-  gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
+  gcc-arm-embedded = (import (builtins.fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs-channels/archive/87f146a41c463a64c93022b11cf19716b3a22037.tar.gz";
+    sha256 = "0rk8haf19plw6vyvq0am99rik0hrrysknjw0f2vs7985awngy3q2";
+  }) {}).gcc-arm-embedded;
 
   avr_incflags = [
     "-isystem ${avrlibc}/avr/include"
-- 
cgit v1.2.3


From e05b32d8941c90f5af8da85f29190c45e917bbd3 Mon Sep 17 00:00:00 2001
From: Francis St-Amour <fstamour@users.noreply.github.com>
Date: Sat, 21 Sep 2019 14:59:18 -0400
Subject: add python3 to shell.nix (#6774)

---
 shell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'shell.nix')

diff --git a/shell.nix b/shell.nix
index e85221975d..df5aff3508 100644
--- a/shell.nix
+++ b/shell.nix
@@ -32,7 +32,7 @@ in
 stdenv.mkDerivation {
   name = "qmk-firmware";
 
-  buildInputs = [ dfu-programmer dfu-util diffutils git ]
+  buildInputs = [ dfu-programmer dfu-util diffutils git python3 ]
     ++ lib.optional avr [ avrbinutils avrgcc avrlibc avrdude ]
     ++ lib.optional arm [ gcc-arm-embedded ]
     ++ lib.optional teensy [ teensy-loader-cli ];
-- 
cgit v1.2.3


From 8dc9764f31ce3326b2f5fd1a3bea216e86cf4734 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Thu, 14 Nov 2019 15:00:36 -0500
Subject: Fix shell.nix by pinning nixpkgs (#6213)

---
 shell.nix | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

(limited to 'shell.nix')

diff --git a/shell.nix b/shell.nix
index df5aff3508..d7c3b61744 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,17 +1,33 @@
-# dfu-programmer doesn't have darwin on it's list of supported platforms
-{ pkgs ? import <nixpkgs> { config = { allowUnsupportedSystem = true; }; }
-, avr ? true, arm ? true, teensy ? true }:
+{ avr ? true, arm ? true, teensy ? true }:
 
-with pkgs;
 let
-  avrbinutils = pkgsCross.avr.buildPackages.binutils;
-  avrlibc = pkgsCross.avr.libcCross;
-  gcc-arm-embedded = (import (builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs-channels/archive/87f146a41c463a64c93022b11cf19716b3a22037.tar.gz";
-    sha256 = "0rk8haf19plw6vyvq0am99rik0hrrysknjw0f2vs7985awngy3q2";
-  }) {}).gcc-arm-embedded;
+  overlay = self: super:
+    let addDarwinSupport = pkg: pkg.overrideAttrs (oldAttrs: {
+      meta.platforms = (oldAttrs.meta.platforms or []) ++ self.lib.platforms.darwin;
+    });
+    in {
+      dfu-programmer = addDarwinSupport super.dfu-programmer;
+      teensy-loader-cli = addDarwinSupport super.teensy-loader-cli;
+
+      avrgcc = super.avrgcc.overrideAttrs (oldAttrs: rec {
+        name = "avr-gcc-8.1.0";
+        src = super.fetchurl {
+          url = "mirror://gcc/releases/gcc-8.1.0/gcc-8.1.0.tar.xz";
+          sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x";
+        };
+      });
+    };
 
-  avr_incflags = [
+  nixpkgs = builtins.fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs/archive/0260747427737b980f0.tar.gz";
+    sha256 = "1p2yc6b40xvvxvmlqd9wb440pkrimnlc2wsbpa5rddlpx1dn8qmf";
+  };
+
+  pkgs = import nixpkgs { overlays = [ overlay ]; };
+in
+
+with pkgs;
+let avr_incflags = [
     "-isystem ${avrlibc}/avr/include"
     "-B${avrlibc}/avr/lib/avr5"
     "-L${avrlibc}/avr/lib/avr5"
@@ -20,15 +36,7 @@ let
     "-B${avrlibc}/avr/lib/avr51"
     "-L${avrlibc}/avr/lib/avr51"
   ];
-  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";
-      sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x";
-    };
-  });
 in
-
 stdenv.mkDerivation {
   name = "qmk-firmware";
 
-- 
cgit v1.2.3