From f6405d9c450ccde3fe7564834d1e601fb81ce512 Mon Sep 17 00:00:00 2001 From: Benson Chu Date: Sat, 21 Jun 2025 11:29:03 -0500 Subject: [PATCH] Pull in my upstream changes! --- common/overlays.nix | 11 ++--------- flake.lock | 6 +++--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/common/overlays.nix b/common/overlays.nix index 812c0d9..82176b7 100644 --- a/common/overlays.nix +++ b/common/overlays.nix @@ -11,16 +11,9 @@ inputs: }); }) - (final: prev: - let - emacs-with-xrandr = final.emacs-unstable.overrideAttrs ( - oa: { - buildInputs = oa.buildInputs ++ [ prev.xorg.libXrandr ]; - } - ); - in { + (final: prev: { myEmacs = - ((prev.emacsPackagesFor emacs-with-xrandr) + ((prev.emacsPackagesFor final.emacs-unstable) .emacsWithPackages (epkgs: with epkgs; [ treesit-grammars.with-all-grammars mu4e diff --git a/flake.lock b/flake.lock index 82a623a..244cde6 100644 --- a/flake.lock +++ b/flake.lock @@ -79,11 +79,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737165118, - "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", + "lastModified": 1750330365, + "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", + "rev": "d883b6213afa179b58ba8bace834f1419707d0ad", "type": "github" }, "original": {