From 4dfd82f6ec5bf487864d4cf951d8efd7a3045331 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 9 Sep 2020 15:19:43 +0800
Subject: [PATCH] nix: pin mozilla overlay

---
 default.nix         |  6 +-----
 mozilla-overlay.nix | 10 ++++++++++
 shell.nix           |  3 +--
 3 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 mozilla-overlay.nix

diff --git a/default.nix b/default.nix
index aaacca6..b0e8ecf 100644
--- a/default.nix
+++ b/default.nix
@@ -1,9 +1,5 @@
-{
-  mozillaOverlay ? import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz),
-}:
-
 let
-  pkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
+  pkgs = import <nixpkgs> { overlays = [ (import ./mozilla-overlay.nix) ]; };
   rustPlatform = (import ./rustPlatform.nix { inherit pkgs; });
   artiqpkgs = import <artiq-fast/default.nix> { inherit pkgs; };
   vivado = import <artiq-fast/vivado.nix> { inherit pkgs; };
diff --git a/mozilla-overlay.nix b/mozilla-overlay.nix
new file mode 100644
index 0000000..fef0301
--- /dev/null
+++ b/mozilla-overlay.nix
@@ -0,0 +1,10 @@
+let
+  pkgs = import <nixpkgs> {};
+  overlay = pkgs.fetchFromGitHub {
+    owner = "mozilla";
+    repo = "nixpkgs-mozilla";
+    rev = "efda5b357451dbb0431f983cca679ae3cd9b9829";
+    sha256 = "11wqrg86g3qva67vnk81ynvqyfj0zxk83cbrf0p9hsvxiwxs8469";
+  };
+in
+  import overlay
diff --git a/shell.nix b/shell.nix
index 5734dee..9e11daa 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,6 +1,5 @@
 let
-  mozillaOverlay = import (builtins.fetchTarball "https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz");
-  pkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
+  pkgs = import <nixpkgs> { overlays = [ (import ./mozilla-overlay.nix) ]; };
   artiq-fast = <artiq-fast>;
   rustPlatform = (import ./rustPlatform.nix { inherit pkgs; });
   artiqpkgs = import "${artiq-fast}/default.nix" { inherit pkgs; };