[bug#43276] gnu: emacs-org-contrib: Fix origin hash.

Hi Guix!

The recent emacs-org-contrib update gives me the wrong hash, is anybody
having the same issue?

Here's a patch to fix it.

Thanks,
Pierre

Fixed with 057d584b981d9a3293be03ee863d40a61c8aae74

Thanks!
Pierre

Pierre Langlois writes:

> Hi Guix!
>
> The recent emacs-org-contrib update gives me the wrong hash, is anybody
> having the same issue?
>
> Here's a patch to fix it.
>
> Thanks,
> Pierre
>
> From eb0001854dc605f4d59afae2d05b87eafc8ce818 Mon Sep 17 00:00:00 2001
> From: Pierre Langlois <pierre.langlois@gmx.com>
> Date: Tue, 8 Sep 2020 12:56:45 +0100
> Subject: [PATCH] gnu: emacs-org-contrib: Fix origin hash.
>
> * gnu/packages/emacs-xyz.scm (emacs-org-contrib)[origin]: Update hash.
> ---
>  gnu/packages/emacs-xyz.scm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> index b346562959..1bf0611cf9 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -9665,7 +9665,7 @@ programming and reproducible research.")
>         (uri (string-append "https://orgmode.org/elpa/"
>                             "org-plus-contrib-" version ".tar"))
>         (sha256
> -        (base32 "1f2471klf0v90irpp80413y4v6mhf9bwmrirdilk7qz2p1l6wf4z"))))
> +        (base32 "1rgk3pwhsmbmwlncg60ahwrrkm1ks4xpwy2wzv9q7myl1aihjj54"))))
>      (arguments
>       `(#:modules ((guix build emacs-build-system)
>                    (guix build utils)

Hi,

On Wed, 9 Sep 2020 at 14:46, Pierre Langlois <pierre.langlois@gmx.com> wrote:
>
>
> Fixed with 057d584b981d9a3293be03ee863d40a61c8aae74

Not for me.

--8<---------------cut here---------------start------------->8---
guix time-machine --commit=057d584b981d9a3293be03ee863d40a61c8aae74 \
        -- build emacs-org-contrib
[...]
Starting download of
/gnu/store/bbc7d0dw6wl4vdhw9sfx35827f8qg42h-org-plus-contrib-20200908.tar
From https://orgmode.org/elpa/org-plus-contrib-20200908.tar...
download failed
"https://orgmode.org/elpa/org-plus-contrib-20200908.tar" 404 "Not
Found"

Starting download of
/gnu/store/bbc7d0dw6wl4vdhw9sfx35827f8qg42h-org-plus-contrib-20200908.tar
From https://ci.guix.gnu.org/file/org-plus-contrib-20200908.tar/sha256/1rgk3pwhsmbmwlncg60ahwrrkm1ks4xpwy2wzv9q7myl1aihjj54...
download failed
"https://ci.guix.gnu.org/file/org-plus-contrib-20200908.tar/sha256/1rgk3pwhsmbmwlncg60ahwrrkm1ks4xpwy2wzv9q7myl1aihjj54"
404 "Not Found"

Starting download of
/gnu/store/bbc7d0dw6wl4vdhw9sfx35827f8qg42h-org-plus-contrib-20200908.tar
From https://tarballs.nixos.org/sha256/1rgk3pwhsmbmwlncg60ahwrrkm1ks4xpwy2wzv9q7myl1aihjj54...
download failed
"https://tarballs.nixos.org/sha256/1rgk3pwhsmbmwlncg60ahwrrkm1ks4xpwy2wzv9q7myl1aihjj54"
404 "Not Found"

Starting download of
/gnu/store/bbc7d0dw6wl4vdhw9sfx35827f8qg42h-org-plus-contrib-20200908.tar
From https://archive.softwareheritage.org/api/1/content/sha256:a44809a30ad4d783d3fe5c787e3bd133d49933870a98c72ce575550df91df3e5/raw/...
download failed
"https://archive.softwareheritage.org/api/1/content/sha256:a44809a30ad4d783d3fe5c787e3bd133d49933870a98c72ce575550df91df3e5/raw/"
404 "Not Found"
failed to download
"/gnu/store/bbc7d0dw6wl4vdhw9sfx35827f8qg42h-org-plus-contrib-20200908.tar"
from "https://orgmode.org/elpa/org-plus-contrib-20200908.tar"
builder for `/gnu/store/01ncd7q8zd15mbckads5na0ys4a100ng-org-plus-contrib-20200908.tar.drv'
failed to produce output path
`/gnu/store/bbc7d0dw6wl4vdhw9sfx35827f8qg42h-org-plus-contrib-20200908.tar'
build of /gnu/store/01ncd7q8zd15mbckads5na0ys4a100ng-org-plus-contrib-20200908.tar.drv
failed

--8<---------------cut here---------------end--------------->8---

Sorry, I duplicate this bug with 43292 (now close)
http://issues.guix.gnu.org/issue/43292

All the best,
simon

zimoun writes:

> Hi,
>
> On Wed, 9 Sep 2020 at 14:46, Pierre Langlois <pierre.langlois@gmx.com> wrote:
>>
>>
>> Fixed with 057d584b981d9a3293be03ee863d40a61c8aae74
>
> Not for me.

Actually, yeah it didn't fix it for me either, I was too quick closing
this bug. But, the next commit does fix it I think.

@Tobias, the hash that's now upstream is the only one I've seen locally,
and I assume it's the same case for simon. Do you happen to still have
the tar ball with the previous hash? I'm curious what changed upstream,
if it's unstable we might be better off using a git repo instead of
elpa, as in code.orgmode.org/bzg/worg/src/master/org-contrib. Although
then I don't know which commit corresponds to what's on elpa :-/.

>
> --8<---------------cut here---------------start------------->8---
> guix time-machine --commit=057d584b981d9a3293be03ee863d40a61c8aae74 \
>         -- build emacs-org-contrib
> [...]
> Starting download of
> /gnu/store/bbc7d0dw6wl4vdhw9sfx35827f8qg42h-org-plus-contrib-20200908.tar
> From https://orgmode.org/elpa/org-plus-contrib-20200908.tar...
> download failed
> "https://orgmode.org/elpa/org-plus-contrib-20200908.tar" 404 "Not
> Found"
>
> Starting download of
> /gnu/store/bbc7d0dw6wl4vdhw9sfx35827f8qg42h-org-plus-contrib-20200908.tar
> From https://ci.guix.gnu.org/file/org-plus-contrib-20200908.tar/sha256/1rgk3pwhsmbmwlncg60ahwrrkm1ks4xpwy2wzv9q7myl1aihjj54...
> download failed
> "https://ci.guix.gnu.org/file/org-plus-contrib-20200908.tar/sha256/1rgk3pwhsmbmwlncg60ahwrrkm1ks4xpwy2wzv9q7myl1aihjj54"
> 404 "Not Found"
>
> Starting download of
> /gnu/store/bbc7d0dw6wl4vdhw9sfx35827f8qg42h-org-plus-contrib-20200908.tar
> From https://tarballs.nixos.org/sha256/1rgk3pwhsmbmwlncg60ahwrrkm1ks4xpwy2wzv9q7myl1aihjj54...
> download failed
> "https://tarballs.nixos.org/sha256/1rgk3pwhsmbmwlncg60ahwrrkm1ks4xpwy2wzv9q7myl1aihjj54"
> 404 "Not Found"
>
> Starting download of
> /gnu/store/bbc7d0dw6wl4vdhw9sfx35827f8qg42h-org-plus-contrib-20200908.tar
> From https://archive.softwareheritage.org/api/1/content/sha256:a44809a30ad4d783d3fe5c787e3bd133d49933870a98c72ce575550df91df3e5/raw/...
> download failed
> "https://archive.softwareheritage.org/api/1/content/sha256:a44809a30ad4d783d3fe5c787e3bd133d49933870a98c72ce575550df91df3e5/raw/"
> 404 "Not Found"
> failed to download
> "/gnu/store/bbc7d0dw6wl4vdhw9sfx35827f8qg42h-org-plus-contrib-20200908.tar"
> from "https://orgmode.org/elpa/org-plus-contrib-20200908.tar"
> builder for `/gnu/store/01ncd7q8zd15mbckads5na0ys4a100ng-org-plus-contrib-20200908.tar.drv'
> failed to produce output path
> `/gnu/store/bbc7d0dw6wl4vdhw9sfx35827f8qg42h-org-plus-contrib-20200908.tar'
> build of /gnu/store/01ncd7q8zd15mbckads5na0ys4a100ng-org-plus-contrib-20200908.tar.drv
> failed
>
> --8<---------------cut here---------------end--------------->8---
>
> Sorry, I duplicate this bug with 43292 (now close)
> http://issues.guix.gnu.org/issue/43292

No worries!

Thanks,
Pierre

Pierre Langlois writes:

> zimoun writes:
>
>> Hi,
>>
>> On Wed, 9 Sep 2020 at 14:46, Pierre Langlois <pierre.langlois@gmx.com> wrote:
>>>
>>>
>>> Fixed with 057d584b981d9a3293be03ee863d40a61c8aae74
>>
>> Not for me.
>
> Actually, yeah it didn't fix it for me either, I was too quick closing
> this bug. But, the next commit does fix it I think.
>
> @Tobias, the hash that's now upstream is the only one I've seen locally,
> and I assume it's the same case for simon. Do you happen to still have
> the tar ball with the previous hash? I'm curious what changed upstream,
> if it's unstable we might be better off using a git repo instead of
> elpa, as in code.orgmode.org/bzg/worg/src/master/org-contrib. Although
> then I don't know which commit corresponds to what's on elpa :-/.

Oh, ignore the org-contrib git repository, that's not the same as
org-plus-contrib-<date>.tar at all in fact.

On Wed, 9 Sep 2020 at 15:17, Pierre Langlois <pierre.langlois@gmx.com> wrote:
>
>
> zimoun writes:
>
> > Hi,
> >
> > On Wed, 9 Sep 2020 at 14:46, Pierre Langlois <pierre.langlois@gmx.com> wrote:
> >>
> >>
> >> Fixed with 057d584b981d9a3293be03ee863d40a61c8aae74
> >
> > Not for me.
>
> Actually, yeah it didn't fix it for me either, I was too quick closing
> this bug. But, the next commit does fix it I think.

Yes.  But as Tobias raised up:

   I think it's good not to normalize them by at least briefly describing
   the upstream changes in the commit message. ‘Fix’ is borderline
   misleading IMO.

i.e., something along:

--8<---------------cut here---------------start------------->8---
gnu: emacs-org-contrib: Update source hash.

The previous tarball was modified in-place; see????????

* gnu/packages/emacs-xyz.scm (emacs-org-contrib)[source](sha256): Update.
--8<---------------cut here---------------end--------------->8---
(tweaked from harfbuzz replacement a8bb8fccd8)

Anyway.

 > @Tobias, the hash that's now upstream is the only one I've seen locally,
> and I assume it's the same case for simon. Do you happen to still have
> the tar ball with the previous hash? I'm curious what changed upstream,
> if it's unstable we might be better off using a git repo instead of
> elpa, as in code.orgmode.org/bzg/worg/src/master/org-contrib. Although
> then I don't know which commit corresponds to what's on elpa :-/.

I agree.  If Tobias still has the tarball, then it could be on Berlin
as substitute.  Otherwise "guix time-machine" will be broken for a
couple of commits (the 35 ones of the 2 last days, if I count
correctly).
Going to something content-addressed is a good idea, IMHO.  But I do
not know either how from where this "org-plus-contrib" comes?
The future disassemble and SWH backend should fix this kind of issues, I guess.


All the best,
simon