diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 16 | ||||
| -rw-r--r-- | gnu/packages/patches/emacs-unpackaged-req.patch | 24 |
3 files changed, 11 insertions, 30 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index ad85894ebe..8e535e208b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -792,7 +792,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ %D%/packages/patches/emacs-source-date-epoch.patch \ - %D%/packages/patches/emacs-unpackaged-req.patch \ %D%/packages/patches/emacs-undohist-ignored.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ %D%/packages/patches/emacs-zones-called-interactively.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e30d3cea71..f0e86016e7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -614,8 +614,8 @@ from within Emacs.") (license license:gpl3+))) (define-public emacs-unpackaged-el - (let ((commit "f4df7f8dfea715e893b2223adda32545803f5cce") - (revision "1")) + (let ((commit "c0d58cf81e531b2b6fa1bd5dd612dc1b93d4d186") + (revision "2")) (package (name "emacs-unpackaged-el") (version (git-version "0" revision commit)) @@ -628,9 +628,7 @@ from within Emacs.") (file-name (git-file-name name version)) (sha256 (base32 - "1yf3zrgqfhnr0az8gn1kqqwnhfi3nc0vbjkcagwcqwk3sp1jda86")) - (patches - (search-patches "emacs-unpackaged-req.patch")))) + "0y3sgvd51l4pb3acps92bazfk49da6nim1f1hyxzy1ravg4kbw83")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) @@ -638,6 +636,14 @@ from within Emacs.") ("emacs-s" ,emacs-s) ("emacs-hydra" ,emacs-hydra) ("emacs-use-package" ,emacs-use-package))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'require-hydra + (lambda _ + (substitute* "unpackaged.el" + ((";;; Code:") ";;; Code:\n(require 'hydra)")) + #t))))) (home-page "https://github.com/alphapapa/unpackaged.el") (synopsis "Useful snippets of Emacs Lisp code") (description "This package provides Emacs Lisp utilities for a variety diff --git a/gnu/packages/patches/emacs-unpackaged-req.patch b/gnu/packages/patches/emacs-unpackaged-req.patch deleted file mode 100644 index ddb9277610..0000000000 --- a/gnu/packages/patches/emacs-unpackaged-req.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e5be173e201710538464c279335bef735a327a68 Mon Sep 17 00:00:00 2001 -From: Brian Leung <bkleung89@gmail.com> -Date: Tue, 18 Jun 2019 06:37:46 +0200 -Subject: [PATCH] Add missing require. - ---- - unpackaged.el | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/unpackaged.el b/unpackaged.el -index 2d46b3c..e62184a 100644 ---- a/unpackaged.el -+++ b/unpackaged.el -@@ -38,6 +38,7 @@ - (require 'dash) - (require 's) - (require 'use-package) -+(require 'hydra) - - ;;; Faces, fonts - --- -2.22.0 - |