* [bug#30153] [PATCH] gnu: emacs-org: Update to 20180115.
[not found] <f66cd2f6-0973-4813-51a4-62ee7e50a65f@yahoo.com>
@ 2018-01-18 22:49 ` Vasile Dumitrascu
2018-01-18 23:04 ` bug#30153: " Nicolas Goaziou
0 siblings, 1 reply; 2+ messages in thread
From: Vasile Dumitrascu @ 2018-01-18 22:49 UTC (permalink / raw)
To: 30153
[-- Attachment #1: Type: text/plain, Size: 2267 bytes --]
Hi Nicolas
Please find attached an updated patch to take into account the things
below, including updating to version 20180103.
Thank you,
Vasile
Nicolas Goaziou:
> Hello,
>
> Vasile Dumitrascu <va511e@yahoo.com> writes:
>
>> First, please ignore the initial patch, as the commit was done on a
>> wrong file version. Second, please find attached the correct patch that
>> updates emacs-org and changes the source repository to the original
>> orgmode.org as elpa does not track and have all the updates published
>> officially.
>>
>> I think tracking directly the orgmode repo should be better than
>> tracking a elpa. Currently for example, in the original repo there are
>> releases that are not present in elpa.
>
> Thank you.
>
> However, so far, I only published tagged releases. For example, the
> latest tagged release (aka Org 9.1.6) is org-20180103.tar. Other
> releases are cuts from the stable branch. IMO, we should keep it that
> way.
>
> There is an issue with Org repo and ELPA at the moment, but they should
> usually be mirrors. IIUC, keeping ELPA as the source allows the ELPA
> updater to function properly. So, perhaps we should temporarily move to
> orgmode.org, until mirroring is fixed, then switch back to ELPA.
>
>> ;; emacs-org-contrib inherits from this package. Please update its sha256
>> ;; checksum as well.
>
> Per comment, you need to update emacs-org-contrib package as well.
>
>> - (version "20171205")
>> + (version "20180115")
>
> See above. It should probably be org-20180103.tar.
>
>> (source (origin
>> (method url-fetch)
>> - (uri (string-append "http://elpa.gnu.org/packages/org-"
>> + (uri (string-append "http://orgmode.org/elpa/org-"
>
> "https://orgmode.org/elpa/org-"
>
>> version ".tar"))
>> (sha256
>> (base32
>> - "0a1rm94ci47jf5579sxscily680ysmy3hnxjcs073n45nk76za04"))))
>> + "1zc75kxbx9bk1xag46s027a290fnva1id8vv92lz9i5nkqnrm430"))))
>> (build-system emacs-build-system)
>> (home-page "http://orgmode.org/")
>
> Albeit not directly related to your patch, this should also be fixed
> (http -> https).
>
> Regards,
>
[-- Attachment #2: 0001-gnu-emacs-org-Update-to-20180103.patch --]
[-- Type: text/x-patch, Size: 2373 bytes --]
From 2a3be129f790329c04484b9fd1d162133303a15d Mon Sep 17 00:00:00 2001
From: Vasile Dumitrascu <va511e@yahoo.com>
Date: Thu, 18 Jan 2018 15:41:43 +0100
Subject: [PATCH] gnu: emacs-org: Update to 20180103.
* gnu/packages/emacs.scm (emacs-org): Update to 20180103.
[source]: Use orgmode.org instead of elpa.
[home-page]: Update to use https.
* gnu/packages/emacs.scm (emacs-org-contrib): Update to 20180103.
[source]: Update to use https.
---
gnu/packages/emacs.scm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 1cf14993c..b29761d51 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -4206,16 +4206,16 @@ passive voice.")
(name "emacs-org")
;; emacs-org-contrib inherits from this package. Please update its sha256
;; checksum as well.
- (version "20171205")
+ (version "20180103")
(source (origin
(method url-fetch)
- (uri (string-append "http://elpa.gnu.org/packages/org-"
+ (uri (string-append "https://orgmode.org/elpa/org-"
version ".tar"))
(sha256
(base32
- "0a1rm94ci47jf5579sxscily680ysmy3hnxjcs073n45nk76za04"))))
+ "1hyw9sigcv9wn37y2icmhf1czf0s3dgvsmn36355l95zsw7hnvgj"))))
(build-system emacs-build-system)
- (home-page "http://orgmode.org/")
+ (home-page "https://orgmode.org/")
(synopsis "Outline-based notes management and organizer")
(description "Org is an Emacs mode for keeping notes, maintaining TODO
lists, and project planning with a fast and effective plain-text system. It
@@ -4229,11 +4229,11 @@ reproducible research.")
(name "emacs-org-contrib")
(source (origin
(method url-fetch)
- (uri (string-append "http://orgmode.org/elpa/org-plus-contrib-"
+ (uri (string-append "https://orgmode.org/elpa/org-plus-contrib-"
(package-version emacs-org) ".tar"))
(sha256
(base32
- "1y61csa284gy8l0fj0mv67mkm4fsi4lz401987qp6a6z260df4n5"))))
+ "164i2asqh34p1g3iqsn7rziyxbi1ys8fwdmn7nsw5xph8qszv9zj"))))
(arguments
`(#:modules ((guix build emacs-build-system)
(guix build utils)
--
2.15.1
^ permalink raw reply related [flat|nested] 2+ messages in thread