[PATCH] gnu: nmoldyn: New source code location.

DoneSubmitted by Konrad Hinsen.
Details
2 participants
  • Konrad Hinsen
  • Ludovic Courtès
Owner
unassigned
Severity
normal
K
K
Konrad Hinsen wrote on 19 Nov 2019 19:49
(address . guix-patches@gnu.org)
m1a78r6k8w.fsf@khs-macbook.home
* gnu/packages/chemistry.scm (nmoldyn): New source code location.
Following the annoucement of Bitbucket to delete all
Mercurial repositories in June 2020, the source code has
been migrated to GitHub.
---
gnu/packages/chemistry.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index b6345b9d27..3bdd406a47 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -243,13 +243,14 @@ analogy is that InChI is the bar-code for chemistry and chemical structures.")
     (version "3.0.11")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://bitbucket.org/khinsen/"
-                           "nmoldyn3/downloads/nMOLDYN-"
-                           version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/khinsen/nMOLDYN3")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
-         "1mvmz3lkr217kdrd8cvdr1d82y58wp1403c9rnd943mijgq8xb5a"))))
+         "016h4bqg419p6s7bcx55q5iik91gqmk26hbnfgj2j6zl0j36w51r"))))
     (build-system python-build-system)
     (inputs
      `(("python-matplotlib" ,(with-numpy-1.8 python2-matplotlib))
-- 
2.24.0
L
L
Ludovic Courtès wrote on 21 Nov 2019 10:11
(name . Konrad Hinsen)(address . konrad.hinsen@fastmail.net)(address . 38290@debbugs.gnu.org)
877e3tk2zz.fsf@gnu.org
Hello!

Konrad Hinsen <konrad.hinsen@fastmail.net> skribis:

Toggle quote (5 lines)
> * gnu/packages/chemistry.scm (nmoldyn): New source code location.
> Following the annoucement of Bitbucket to delete all
> Mercurial repositories in June 2020, the source code has
> been migrated to GitHub.

[...]

Toggle quote (14 lines)
> - (method url-fetch)
> - (uri (string-append "https://bitbucket.org/khinsen/"
> - "nmoldyn3/downloads/nMOLDYN-"
> - version ".tar.gz"))
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/khinsen/nMOLDYN3")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> (sha256
> (base32
> - "1mvmz3lkr217kdrd8cvdr1d82y58wp1403c9rnd943mijgq8xb5a"))))
> + "016h4bqg419p6s7bcx55q5iik91gqmk26hbnfgj2j6zl0j36w51r"))))

It’s weird that the content hash differs. Did you try to diff the hg
checkout and the Git checkout?

Thanks,
Ludo’.
L
L
Ludovic Courtès wrote on 21 Nov 2019 10:13
(name . Konrad Hinsen)(address . konrad.hinsen@fastmail.net)(address . 38290@debbugs.gnu.org)
87y2w9ioch.fsf@gnu.org
Ludovic Courtès <ludo@gnu.org> skribis:

Toggle quote (17 lines)
>> - (method url-fetch)
>> - (uri (string-append "https://bitbucket.org/khinsen/"
>> - "nmoldyn3/downloads/nMOLDYN-"
>> - version ".tar.gz"))
>> + (method git-fetch)
>> + (uri (git-reference
>> + (url "https://github.com/khinsen/nMOLDYN3")
>> + (commit (string-append "v" version))))
>> + (file-name (git-file-name name version))
>> (sha256
>> (base32
>> - "1mvmz3lkr217kdrd8cvdr1d82y58wp1403c9rnd943mijgq8xb5a"))))
>> + "016h4bqg419p6s7bcx55q5iik91gqmk26hbnfgj2j6zl0j36w51r"))))
>
> It’s weird that the content hash differs. Did you try to diff the hg
> checkout and the Git checkout?

Oh forget it, I see we’re going from a tarball to a checkout, hence the
difference.

LGTM! :-)
L
L
Ludovic Courtès wrote on 21 Nov 2019 11:14
control message for bug #38290
(address . control@debbugs.gnu.org)
87k17tiljp.fsf@gnu.org
tags 38290 fixed
close 38290
quit
?
Your comment

This issue is archived.

To comment on this conversation send email to 38290@debbugs.gnu.org