Pull in my upstream changes!

This commit is contained in:
Benson Chu 2025-06-21 11:29:03 -05:00
parent 1556bc8aa4
commit bf73f861f3
2 changed files with 11 additions and 18 deletions

View file

@ -11,16 +11,9 @@ inputs:
}); });
}) })
(final: prev: (final: prev: {
let
emacs-with-xrandr = final.emacs-unstable.overrideAttrs (
oa: {
buildInputs = oa.buildInputs ++ [ prev.xorg.libXrandr ];
}
);
in {
myEmacs = myEmacs =
((prev.emacsPackagesFor emacs-with-xrandr) ((prev.emacsPackagesFor final.emacs-unstable)
.emacsWithPackages (epkgs: with epkgs; [ .emacsWithPackages (epkgs: with epkgs; [
treesit-grammars.with-all-grammars treesit-grammars.with-all-grammars
mu4e mu4e

View file

@ -8,11 +8,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1749806554, "lastModified": 1750523034,
"narHash": "sha256-mvvQ8dcGJTmUfudSD8i0Wd4uiQpjcKjDPX9ruEbYK2k=", "narHash": "sha256-4jYxNHn/9iyAANAXc3pkhhNeTyAJISshP3lgjH9l70o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "d2fb39a8ecf7610891cbc64cff05588308c5166a", "rev": "7a26e0974d0a1dd5d295a80f533814206d78523f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,11 +79,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1737165118, "lastModified": 1750330365,
"narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", "rev": "d883b6213afa179b58ba8bace834f1419707d0ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -95,11 +95,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1749668643, "lastModified": 1750330365,
"narHash": "sha256-gaWJEWGBW/g1u6o5IM4Un0vluv86cigLuBnjsKILffc=", "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1965fd20a39c8e441746bee66d550af78f0c0a7b", "rev": "d883b6213afa179b58ba8bace834f1419707d0ad",
"type": "github" "type": "github"
}, },
"original": { "original": {