chore(3p/nixpkgs): Bump nixpkgs channels to 2021-08-04 r/2710

I used //tools/depot-nixpkgs-update for this - thanks again, sterni!

Included fixes:

* temporary workaround for building notmuch python package, fixed in
  upstream already (but channel hasn't advanced there)
* Disable fprintd in grfn.system.yeren, as the fprintd-tod package
  currently has a version mismatch in nixpkgs

Co-authored-by: Griffin Smith <grfn@gws.fyi>
Change-Id: If6d71b08ace9db57daadfe3b69b9cd4aec6a5a4e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3274
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI

3 files changed, 19 insertions, 10 deletions

diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 597c3a89ff..34fb708a0a 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 2021-07-25.
+  # Tracking nixos-unstable as of 2021-08-04.
   unstableHashes = {
-    commit = "dd14e5d78e90a2ccd6007e569820de9b4861a6c2";
-    sha256 = "1zmhwx1qqgl1wrrb9mjkck508887rldrnragvximhd7jrh1ya3fb";
+    commit = "c464dc811babfe316ed4ab7bbc12351122e69dd7";
+    sha256 = "0aij4q6pc99xjqh0inv6z74wiqfdgxnbg7jli6gnjqxg2lcirrc2";
   };
 
-  # Tracking nixos-21.05 as of 2021-07-25.
+  # Tracking nixos-21.05 as of 2021-08-03.
   stableHashes = {
-    commit = "973910f5c31b9ba6c171c33a8bd7199990b14c72";
-    sha256 = "1n1kibmn1fcjazaxp8lydwdx646lknqksv5b2fm33fdq2dvafvj7";
+    commit = "d4590d21006387dcb190c516724cb1e41c0f8fdf";
+    sha256 = "17q39hlx1x87xf2rdygyimj8whdbx33nzszf4rxkc6b85wz0l38n";
   };
 
   # 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 3482b7416b..7c7c8ea06a 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -28,4 +28,12 @@ self: super: {
       tvlPackages = depot.tools.emacs-pkgs // depot.third_party.emacs;
     })
   );
+
+  # Temporary fix for python3Packages.notmuch
+  # See https://github.com/NixOS/nixpkgs/pull/132592/
+  notmuch = super.notmuch.overrideAttrs(old: {
+    passthru = old.passthru // {
+      pythonSourceRoot = "notmuch-${old.version}/bindings/python";
+    };
+  });
 }
diff --git a/users/grfn/system/system/machines/yeren.nix b/users/grfn/system/system/machines/yeren.nix
index 7d4a215d1d..125700c0a2 100644
--- a/users/grfn/system/system/machines/yeren.nix
+++ b/users/grfn/system/system/machines/yeren.nix
@@ -90,10 +90,11 @@
     intel-media-driver
   ];
 
-  services.fprintd = {
-    enable = true;
-    package = pkgs.fprintd-tod;
-  };
+  # Disabled for now until libfprint-tod can get a version bump
+  # services.fprintd = {
+  #   enable = true;
+  #   package = pkgs.fprintd-tod;
+  # };
 
   systemd.services.fprintd.environment.FP_TOD_DRIVERS_DIR =
     "${pkgs.libfprint-2-tod1-goodix}/usr/lib/libfprint-2/tod-1";