about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-01-15T10·57+0100
committersterni <sternenseemann@systemli.org>2022-01-15T14·43+0000
commita6304a1e339527381f98d35aec595b1af977dbf6 (patch)
tree4cf62446baf390a7284631c28dbbbcdc4c02f5aa
parent005cd4037a88f491baf6b6d402f961cd2f44594c (diff)
fix(tools/emacs-pkgs/nix-util): require missing dependencies r/3599
We can't use cl-lib as that apparently doesn't contain lexical-let*.

Change-Id: I8e65d20215ae5667bb92b71e6318ad9d66125320
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4941
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
-rw-r--r--tools/emacs-pkgs/nix-util/default.nix1
-rw-r--r--tools/emacs-pkgs/nix-util/nix-util.el5
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/emacs-pkgs/nix-util/default.nix b/tools/emacs-pkgs/nix-util/default.nix
index ffeb1cefade7..b167cb964214 100644
--- a/tools/emacs-pkgs/nix-util/default.nix
+++ b/tools/emacs-pkgs/nix-util/default.nix
@@ -4,4 +4,5 @@ depot.tools.emacs-pkgs.buildEmacsPackage {
   pname = "nix-util";
   version = "1.0";
   src = ./nix-util.el;
+  externalRequires = epkgs: [ epkgs.s ];
 }
diff --git a/tools/emacs-pkgs/nix-util/nix-util.el b/tools/emacs-pkgs/nix-util/nix-util.el
index 855b53a749b9..924a65880a4b 100644
--- a/tools/emacs-pkgs/nix-util/nix-util.el
+++ b/tools/emacs-pkgs/nix-util/nix-util.el
@@ -1,18 +1,21 @@
 ;;; nix-util.el --- Utilities for dealing with Nix code. -*- lexical-binding: t; -*-
 ;;
 ;; Copyright (C) 2019 Google Inc.
+;; Copyright (C) 2022 The TVL Authors
 ;;
 ;; Author: Vincent Ambo <tazjin@google.com>
 ;; Version: 1.0
-;; Package-Requires: (json map)
+;; Package-Requires: (cl json map s)
 ;;
 ;;; Commentary:
 ;;
 ;; This package adds some functionality that I find useful when
 ;; working in Nix buffers or programs installed from Nix.
 
+(require 'cl)
 (require 'json)
 (require 'map)
+(require 's)
 
 (defvar nix-depot-path "/home/tazjin/depot")