From f48d6550215007cf6e92534f0f67d98ecd3a22ba Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Wed, 12 Jan 2022 13:37:22 +0100
Subject: chore(3p): bump NixOS channels to 2022-01-12

Temporarily use a master commit as some interesting failures have been
fixed there (yubikey-manager and notmuch).

* //users/tazjin/nixos/camden: The acme module was moved around, so we
  need to adjust the disabled module path.

Change-Id: I21c6a1963ffe4205f3577f531ce10b778a82e2ff
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4865
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
---
 third_party/nixpkgs/default.nix       | 12 ++++++------
 third_party/overlays/tvl.nix          | 10 ----------
 users/tazjin/nixos/camden/default.nix |  2 +-
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index c2ff2361ffb5..9badd7cc2cb6 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -13,16 +13,16 @@ let
   # nixos-unstable, and the current stable channel of the latest NixOS
   # release.
 
-  # Tracking nixos-unstable as of 2022-01-02.
+  # Tracking nixpkgs master as of 2022-01-12.
   unstableHashes = {
-    commit = "59bfda72480496f32787cec8c557182738b1bd3f";
-    sha256 = "18akd1chfvniq1q774rigfxgmxwi0wyjljpa1j9ls59szpzr316d";
+    commit = "47d693f2f6673c5197f9606982b697f840b4dcc6";
+    sha256 = "0vwm922ak6s61d09dyayy0inh3r3bgmy9xj8gg55jr79jkl2rab3";
   };
 
-  # Tracking nixos-21.11 as of 2022-01-02.
+  # Tracking nixos-21.11 as of 2022-01-11.
   stableHashes = {
-    commit = "d1e59cfc49961e121583abe32e2f3db1550fbcff";
-    sha256 = "03ldf1dlxqf3g8qh9x5vp6vd9zvvr481fyjds111imll69y60wpm";
+    commit = "386234e2a61e1e8acf94dfa3a3d3ca19a6776efb";
+    sha256 = "1qhfham6vhy67xjdvsmhb3prvsg854wfw4l4avxnvclrcm3k2yg8";
   };
 
   # import the nixos-unstable package set, or optionally use the
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 2b7cf0e9ed8f..f7b1536069cc 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -49,14 +49,4 @@ self: super: {
   mkShell = super.lib.makeOverridable(args: (super.mkShell args) // {
     meta.ci = false;
   });
-
-  # TODO(tazjin): determine whether this is the cause of my suspend
-  # bugs, and if so, upstream it to nixpkgs.
-  xsecurelock = super.xsecurelock.overrideAttrs(drv: rec {
-    buildInputs = drv.buildInputs ++ [ self.makeWrapper ];
-    postInstall = ''
-      wrapProgram $out/libexec/xsecurelock/saver_blank \
-        --prefix PATH : ${self.coreutils}/bin
-    '';
-  });
 }
diff --git a/users/tazjin/nixos/camden/default.nix b/users/tazjin/nixos/camden/default.nix
index ebd4caac75c7..4b5e4b4872c2 100644
--- a/users/tazjin/nixos/camden/default.nix
+++ b/users/tazjin/nixos/camden/default.nix
@@ -13,7 +13,7 @@ in lib.fix(self: {
   # Disable the current ACME module and use the old one from 19.09
   # instead, until the various regressions have been sorted out.
   # TODO(tazjin): Remove this once the new ACME module works.
-  disabledModules = [ "security/acme.nix" ];
+  disabledModules = [ "security/acme" ];
   imports =
     let oldChannel = fetchTarball {
       # NixOS 19.09 on 2020-10-04
-- 
cgit 1.4.1