unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#32005] [PATCH] gnu: emacs-use-package: Update to commit da8c9e2.
@ 2018-06-29 12:38 Peter Mikkelsen
  2018-07-03 13:32 ` bug#32005: " Marius Bakke
  0 siblings, 1 reply; 2+ messages in thread
From: Peter Mikkelsen @ 2018-06-29 12:38 UTC (permalink / raw)
  To: 32005

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]


Hi,

This patch updates 'emacs-use-package' to the latest git commit
instead of using the tagged releases. I found that this is needed,
because the tarball from github did not contain all the files needed
to build the package correctly, which resulted in a lot of errors in
emacs.

Feedback welcome :)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-emacs-use-package-Update-to-commit-da8c9e2.patch --]
[-- Type: text/x-patch, Size: 3278 bytes --]

From 069156a8f81436996fcd84ac03529e1871d8acfa Mon Sep 17 00:00:00 2001
From: Peter Mikkelsen <peter@alaok.org>
Date: Fri, 29 Jun 2018 14:26:56 +0200
Subject: [PATCH] gnu: emacs-use-package: Update to commit da8c9e2.

This update is needed because the release tarball from github does not
contain all the files needed for us to build the package.

* gnu/packages/emacs.scm (emacs-use-package): Update to commit da8c9e2.
[source]: change to git.
[arguments]: Enable tests.
---
 gnu/packages/emacs.scm | 53 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 349ae0d20..c1c3bf65a 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -5771,35 +5771,34 @@ abbreviation of the mode line displays (lighters) of minor modes.")
     (license license:gpl2+)))
 
 (define-public emacs-use-package
-  (package
-    (name "emacs-use-package")
-    (version "2.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/jwiegley/use-package/archive/"
-             version ".tar.gz"))
-       (file-name (string-append name "-" version ".tar.gz"))
-       (sha256
-        (base32
-         "0x4h136jb3imyli6zsh7dyzjrra6pv0v6b0yk94jdng3rdfcmsf5"))))
-    (build-system emacs-build-system)
-    (propagated-inputs
-     `(("emacs-diminish" ,emacs-diminish)))
-    (arguments
-     ;; Tests fail in this release, but have been fixed in
-     ;; upstream commit 7956d40eed57d6c06bef36ebc174cf57d934e30d
-     `(#:tests? #f
-       #:test-command '("emacs" "--batch"
-                        "-l" "use-package-tests.el"
-                        "-f" "ert-run-tests-batch-and-exit")))
-    (home-page "https://github.com/jwiegley/use-package")
-    (synopsis "Declaration for simplifying your .emacs")
-    (description "The use-package macro allows you to isolate package
+  (let ((commit "da8c9e2840343906e732f9699e43d35a1f06481d")
+        (revision "1"))
+    (package
+     (name "emacs-use-package")
+     (version (git-version "2.3" revision commit))
+     (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/jwiegley/use-package")
+                    (commit commit)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0jz38pbq1p9h85i6qcsh3sfzkd103y6mw3rg5zd14dxigp8ir3xz"))))
+     (build-system emacs-build-system)
+     (propagated-inputs
+      `(("emacs-diminish" ,emacs-diminish)))
+     (arguments
+      `(#:tests? #t
+        #:test-command '("emacs" "--batch"
+                         "-l" "use-package-tests.el"
+                         "-f" "ert-run-tests-batch-and-exit")))
+     (home-page "https://github.com/jwiegley/use-package")
+     (synopsis "Declaration for simplifying your .emacs")
+     (description "The use-package macro allows you to isolate package
 configuration in your @file{.emacs} file in a way that is both
 performance-oriented and tidy.")
-    (license license:gpl2+)))
+     (license license:gpl2+))))
 
 (define-public emacs-strace-mode
   (let* ((commit "6a69b4b06db6797af56f33eda5cb28af94e59f11")
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#32005: [PATCH] gnu: emacs-use-package: Update to commit da8c9e2.
  2018-06-29 12:38 [bug#32005] [PATCH] gnu: emacs-use-package: Update to commit da8c9e2 Peter Mikkelsen
@ 2018-07-03 13:32 ` Marius Bakke
  0 siblings, 0 replies; 2+ messages in thread
From: Marius Bakke @ 2018-07-03 13:32 UTC (permalink / raw)
  To: Peter Mikkelsen, 32005-done

[-- Attachment #1: Type: text/plain, Size: 355 bytes --]

Peter Mikkelsen <peter@alaok.org> writes:

> Hi,
>
> This patch updates 'emacs-use-package' to the latest git commit
> instead of using the tagged releases. I found that this is needed,
> because the tarball from github did not contain all the files needed
> to build the package correctly, which resulted in a lot of errors in
> emacs.

Applied, thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-07-03 13:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-29 12:38 [bug#32005] [PATCH] gnu: emacs-use-package: Update to commit da8c9e2 Peter Mikkelsen
2018-07-03 13:32 ` bug#32005: " Marius Bakke

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).