about summary refs log tree commit diff
path: root/third_party/emacs
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2021-07-16T19·13+0200
committersterni <sternenseemann@systemli.org>2021-07-28T12·10+0000
commit6b88df04c1986bf5c40433caa87f1dba8ce8971d (patch)
tree1e992e1487862a04c11d943deb91969efbde6dd1 /third_party/emacs
parentf693f935a7cfe163e5c56ca182ff3a560c2dcdce (diff)
chore(3p/nixpkgs): update channels to 2021-07-25 r/2696
* 3p/buzz: bump to latest master (1.6.0)

* 3p/emacs/explain-pause-mode: adjust to package-build update
  MELPA's package build now cares about git revisions, but calling VC
  commands in a nix build is usually a bad idea. Thus upstream nixpkgs
  passes `$commit` to the `buildPhase` and otherwise fails with an
  error message that doesn't really point to the issue. Upstream change:
  https://github.com/NixOS/nixpkgs/commit/9140d4b06ff09bce8dd8e384eeef832e7811d288

* 3p/overlays/emacs: udpate to 2021-07-25 to support the package-build
  update. Without this emacsPackages.xelb (for tazjin's exwm) would fail.

Change-Id: I7cd782fe7d66ed4ea78c529b79fe761d921f46a8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3253
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'third_party/emacs')
-rw-r--r--third_party/emacs/explain-pause-mode.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/third_party/emacs/explain-pause-mode.nix b/third_party/emacs/explain-pause-mode.nix
index 60e0cd149881..fc57d665d737 100644
--- a/third_party/emacs/explain-pause-mode.nix
+++ b/third_party/emacs/explain-pause-mode.nix
@@ -2,9 +2,13 @@
 
 let
   inherit (pkgs) emacsPackages fetchFromGitHub;
-in emacsPackages.melpaBuild {
+
+  commit = "35f7d780a9c164b5c502023746473b1de3857904";
+
+in emacsPackages.melpaBuild rec {
   pname = "explain-pause-mode";
   version = "0.1"; # master on 20200603
+  inherit commit;
 
   recipe = builtins.toFile "recipe.el" ''
     (explain-pause-mode :fetcher github
@@ -14,7 +18,7 @@ in emacsPackages.melpaBuild {
   src = fetchFromGitHub {
     owner = "lastquestion";
     repo = "explain-pause-mode";
-    rev = "35f7d780a9c164b5c502023746473b1de3857904";
+    rev = commit;
     sha256 = "0d9lwzqqwmz0n94i7959rj7m24265yf3825a5g8cd7fyzxznl1pc";
   };
 }