diff options
| -rw-r--r-- | third_party/nixpkgs/default.nix | 12 | ||||
| -rw-r--r-- | third_party/overlays/tvl.nix | 8 | ||||
| -rw-r--r-- | users/grfn/system/system/machines/yeren.nix | 9 |
3 files changed, 19 insertions, 10 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index 597c3a89ffab..34fb708a0a39 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 3482b7416b4e..7c7c8ea06a43 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 7d4a215d1d69..125700c0a240 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"; |