diff mbox series

[bug#36778] Add and update Emacs packages.

Message ID CAAc=MExwvPuPk2YOR_zXy+QTnTreJ7=_WemXKH3TneJyMucVzw@mail.gmail.com
State Accepted
Headers show
Series [bug#36778] Add and update Emacs packages. | expand

Commit Message

Brian Leung Aug. 3, 2019, 6:32 p.m. UTC 
Two more patches are attached.

On Fri, Aug 2, 2019 at 6:45 AM Brian Leung <bkleung89@gmail.com> wrote:

> OK, I've added two more patches.
>
> On Thu, Aug 1, 2019 at 6:02 PM Brian Leung <bkleung89@gmail.com> wrote:
>
>> I've added another patch.
>>
>> On Tue, Jul 30, 2019 at 11:03 AM Brian Leung <bkleung89@gmail.com> wrote:
>>
>>> I've rebased and updated with several more patches.
>>>
>>> On Sat, Jul 27, 2019 at 5:23 AM Brian Leung <bkleung89@gmail.com> wrote:
>>>
>>>> I rebased and added a few additional patches.
>>>>
>>>

Comments

Ricardo Wurmus Aug. 5, 2019, 2:23 p.m. UTC | #1 
Hi Brian,

Thanks.  I applied all patches with minor changes in commit e15ec8bcec.
I moved “version” out of the let, because we want to use the value
that’s in the “version” field (the one with revision and commit)
throughout.

(I don’t know if that’s a problem with my mail client or if this was the
result of you attaching the patches, but they were not in the expected
order.  Perhaps you could use “git send-email” in the future?)

--
Ricardo
diff mbox series

Patch

From 42a5290f98bab67f12e4ec29ed033f8eed89b3b1 Mon Sep 17 00:00:00 2001
From: Brian Leung <bkleung89@gmail.com>
Date: Sat, 3 Aug 2019 20:15:22 +0200
Subject: [PATCH 1/2] gnu: emacs-org-super-agenda: Update to 1.1.1-1.375bde4.

* gnu/packages/emacs-xyz.scm (emacs-org-super-agenda): Update to 1.1.1-1.375bde4.
---
 gnu/packages/emacs-xyz.scm | 48 +++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 60308fd1a6..a69e56d36a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -10647,29 +10647,33 @@  as well as functions for navigating between these headings.")
     (license license:gpl3+)))
 
 (define-public emacs-org-super-agenda
-  (package
-   (name "emacs-org-super-agenda")
-   (version "1.1")
-   (source (origin
-            (method git-fetch)
-            (uri (git-reference
-                  (url "https://github.com/alphapapa/org-super-agenda")
-                  (commit version)))
-            (file-name (git-file-name name version))
-            (sha256
-             (base32
-              "0vzf91lsxnhwf52kvm8ycpf0wb9c8l91689vyhwgv4wz8q6cvjwp"))))
-   (build-system emacs-build-system)
-   (propagated-inputs
-    `(("emacs-org" ,emacs-org)
-      ("emacs-dash" ,emacs-dash)
-      ("emacs-ht" ,emacs-ht)
-      ("emacs-s" ,emacs-s)))
-   (home-page "https://github.com/alphapapa/org-super-agenda")
-   (synopsis "Supercharged Org agenda")
-   (description "This package allows items in the Org agenda to be grouped
+  ;; emacs-org-sidebar depends on a newer commit than the latest release version.
+  (let ((commit "375bde4ca72494ac88a2a9738754f047fe45cc4e")
+        (version "1.1.1")
+        (revision "1"))
+    (package
+      (name "emacs-org-super-agenda")
+      (version (git-version version revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/alphapapa/org-super-agenda")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0hrwf02fqjm0d9gj146ax67ib76093qpqh7066dcxj2gy20625yj"))))
+      (build-system emacs-build-system)
+      (propagated-inputs
+       `(("emacs-org" ,emacs-org)
+         ("emacs-dash" ,emacs-dash)
+         ("emacs-ht" ,emacs-ht)
+         ("emacs-s" ,emacs-s)))
+      (home-page "https://github.com/alphapapa/org-super-agenda")
+      (synopsis "Supercharged Org agenda")
+      (description "This package allows items in the Org agenda to be grouped
 into sections while preserving the structure imposed by any timestamps.")
-   (license license:gpl3+)))
+      (license license:gpl3+))))
 
 (define-public emacs-org-make-toc
   (package
-- 
2.22.0