From fe7fb8eff4ab07be0e669d28a928a5519c77492e Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Fri, 22 May 2020 18:55:15 +0100
Subject: fix(third_party): Pick Emacs from stable NixOS channel

Emacs is currently subtly broken on nixos-unstable, but I don't care
about debugging that.

To work around it, this reintroduces the NixOS stable channel (20.03)
but as a separate attribute set from which attributes like Emacs can be
picked into //third_party.
---
 third_party/default.nix | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'third_party/default.nix')

diff --git a/third_party/default.nix b/third_party/default.nix
index 2280af9b8f..8f019b3281 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -16,8 +16,16 @@ let
     config.allowBroken = true;
   };
 
+  # Tracking nixos-20.03 as of 2020-05-22
+  stableCommit = "48723f48ab92381f0afd50143f38e45cf3080405";
+  stableNixpkgsSrc = fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs-channels/archive/${commit}.tar.gz";
+    sha256 = "0nkk492aa7pr0d30vv1aw192wc16wpa1j02925pldc09s9m9i0r3";
+  };
+  stableNixpkgs = import stableNixpkgsSrc {};
+
   exposed = {
-    # Inherit the packages from nixpkgs that should be available inside
+    # Inherit the packages from nixos-usntable that should be available inside
     # of the repo. They become available under `pkgs.third_party.<name>`
     inherit (nixpkgs)
       age
@@ -41,10 +49,6 @@ let
       cudatoolkit
       darwin
       dockerTools
-      emacs26
-      emacs26-nox
-      emacsPackages
-      emacsPackagesGen
       fetchFromGitHub
       fetchurl
       fetchzip
@@ -119,6 +123,13 @@ let
       zlib
       zstd;
 
+    # Inherit packages that should come from a stable channel
+    inherit (stableNixpkgs)
+      emacs26
+      emacs26-nox
+      emacsPackages
+      emacsPackagesGen;
+
     # Required by //third_party/nix
     inherit (nixpkgs)
       aws-sdk-cpp
@@ -147,7 +158,7 @@ in exposed // {
 
   # Provide the source code of nixpkgs, but do not provide an imported
   # version of it.
-  inherit nixpkgsSrc;
+  inherit nixpkgsSrc stableNixpkgsSrc;
 
   # Packages to be overridden
   originals = {
-- 
cgit 1.4.1