From 90fdd7f23d6cc0d1374332d49218aef9a0d6a52f Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Thu, 18 Mar 2021 22:08:45 +0100
Subject: chore(3p): bump NixOS channels to 2021-03-18

Making this a monthly service apparently.

Necessary changes:

* 3p: expose emacs27 instead of emacs26 which got removed
  users/tazjin/{camden, frog}: switch from emacs26 to emacs27

* 3p/lieer: google_api_python_client got renamed to
  google-api-python-client

Change-Id: I1011665d10eebc99990addbef6a8a6b000b93896
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2605
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
---
 third_party/default.nix                         | 12 ++++++------
 third_party/lieer/default.nix                   |  2 +-
 third_party/nixpkgs-exposed/exposed/default.nix |  4 ++--
 users/tazjin/nixos/camden/default.nix           |  2 +-
 users/tazjin/nixos/frog/default.nix             |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/third_party/default.nix b/third_party/default.nix
index c3c5ea11bb3d..834ae01e580d 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -5,11 +5,11 @@
 { ... }:
 
 let
-  # Tracking nixos-unstable as of 2021-02-18.
-  nixpkgsCommit = "6b1057b452c55bb3b463f0d7055bc4ec3fd1f381";
+  # Tracking nixos-unstable as of 2021-03-18.
+  nixpkgsCommit = "1f77a4c8c74bbe896053994836790aa9bf6dc5ba";
   nixpkgsSrc = fetchTarball {
     url = "https://github.com/NixOS/nixpkgs/archive/${nixpkgsCommit}.tar.gz";
-    sha256 = "10qfg11g8m0q2k3ibcm0ivjq494gqynshm3smjl1rfn5ifjf5fz8";
+    sha256 = "1j62nmzz3w33dplzf1xz1pg1pfkxii7lwdqmsxmc71cs9cm3s7n1";
   };
   nixpkgs = import nixpkgsSrc {
     config.allowUnfree = true;
@@ -21,11 +21,11 @@ let
     ];
   };
 
-  # Tracking nixos-20.09 as of 2021-02-17.
-  stableCommit = "5c53c720ff690ef82a9fe4849e7b70c104e1c82f";
+  # Tracking nixos-20.09 as of 2021-03-15.
+  stableCommit = "12d9950bf47e0ac20d4d04e189448ee075242117";
   stableNixpkgsSrc = fetchTarball {
     url = "https://github.com/NixOS/nixpkgs/archive/${stableCommit}.tar.gz";
-    sha256 = "0gjxfxbfc6maqg48k9ai476s6zkc94p0y3v9yjgwbiy7b38pqfys";
+    sha256 = "09wy33zbzxj33296ddrrb79630kxpj1c3kiv38zs4wrw24206c2v";
   };
   stableNixpkgs = import stableNixpkgsSrc {};
 
diff --git a/third_party/lieer/default.nix b/third_party/lieer/default.nix
index 631be82a8a49..8bd2916c4034 100644
--- a/third_party/lieer/default.nix
+++ b/third_party/lieer/default.nix
@@ -22,7 +22,7 @@ in python3Packages.buildPythonApplication rec {
   propagatedBuildInputs = with python3Packages; [
     notmuch
     oauth2client
-    google_api_python_client
+    google-api-python-client
     tqdm
   ];
 }
diff --git a/third_party/nixpkgs-exposed/exposed/default.nix b/third_party/nixpkgs-exposed/exposed/default.nix
index f061ed54d9e9..35fd0d21c38c 100644
--- a/third_party/nixpkgs-exposed/exposed/default.nix
+++ b/third_party/nixpkgs-exposed/exposed/default.nix
@@ -40,8 +40,8 @@
     diffutils
     docker-compose
     dockerTools
-    emacs26
-    emacs26-nox
+    emacs27
+    emacs27-nox
     emacsPackages
     emacsPackagesGen
     execline
diff --git a/users/tazjin/nixos/camden/default.nix b/users/tazjin/nixos/camden/default.nix
index d8c439b4f46c..eb33fb4d1b7a 100644
--- a/users/tazjin/nixos/camden/default.nix
+++ b/users/tazjin/nixos/camden/default.nix
@@ -142,7 +142,7 @@ in lib.fix(self: {
       bat
       curl
       direnv
-      emacs26-nox
+      emacs27-nox
       fswebcam
       git
       gnupg
diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix
index 2f0b204a615b..dcc955f96811 100644
--- a/users/tazjin/nixos/frog/default.nix
+++ b/users/tazjin/nixos/frog/default.nix
@@ -242,7 +242,7 @@ in depot.lib.fix(self: {
       curl
       direnv
       dnsutils
-      emacs26 # mostly for emacsclient
+      emacs27 # mostly for emacsclient
       exa
       fd
       file
-- 
cgit 1.4.1