[bug#27906] [PATCH] r-foreign: Update hash and remove duplicate recipe.

[bug#27906] [PATCH] r-foreign: Update hash and remove duplicate recipe.

[Roel Janssen]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-r-foreign-Update-hash-and-remove-duplicate-recipe.patch --]
[-- Type: text/x-diff, Size: 1990 bytes --]

From 8f53dba37fbb34740801bb684e9ddb4f5d22c607 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Tue, 1 Aug 2017 15:51:16 +0200
Subject: [PATCH] r-foreign: Update hash and remove duplicate recipe.

* gnu/packages/statistics.scm (r-foreign): Update hash and remove
  duplicate recipe.
---
 gnu/packages/statistics.scm | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index e9bda5c..99fd2e8 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -373,7 +373,7 @@ Hubert, based on Kaufman and Rousseeuw (1990) \"Finding Groups in Data\".")
        (uri (cran-uri "foreign" version))
        (sha256
         (base32
-         "1mcrm2pydimbyjhkrw5h380bifj1jhwzifph1xgh90asf3lvd1xd"))))
+         "0j0z815zyp8n97rk6hlk68d1r8b26vls39s03viq0pnx3cbpwyga"))))
     (build-system r-build-system)
     (home-page "http://cran.r-project.org/web/packages/foreign")
     (synopsis "Read data stored by other statistics software")
@@ -1602,26 +1602,6 @@ It is based on the methods described in Kaufman and Rousseeuw (1990) \"Finding
 Groups in Data\".")
     (license license:gpl2+)))
 
-(define-public r-foreign
-  (package
-    (name "r-foreign")
-    (version "0.8-67")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (cran-uri "foreign" version))
-       (sha256
-        (base32
-         "1mcrm2pydimbyjhkrw5h380bifj1jhwzifph1xgh90asf3lvd1xd"))))
-    (build-system r-build-system)
-    (home-page "http://cran.r-project.org/web/packages/foreign")
-    (synopsis "Read data stored by other statistics software in R")
-    (description
-     "This package provides functions for reading and writing data stored by
-some versions of Epi Info, Minitab, S, SAS, SPSS, Stata, Systat and Weka, and
-for reading and writing some dBase files.")
-    (license license:gpl2+)))
-
 (define-public r-formula
   (package
     (name "r-formula")
-- 
2.7.4


[-- Attachment #2: Type: text/plain, Size: 301 bytes --]


Dear Guix,

It seems we have two (almost identical) package recipes for r-foreign.
This patch removes one of them.

Also, the upstream tarball seems to have changed, so I updated the
SHA256 hash.

If someone has the old tarball, we could look at what exactly has
changed.

Kind regards,
Roel Janssen

[bug#27906] [PATCH] r-foreign: Update hash and remove duplicate recipe.

[Efraim Flashner]

[-- Attachment #1.1: Type: text/plain, Size: 305 bytes --]

I have /gnu/store/l1xl1hya1q2vdr059i00s0q9rpwb846a-foreign_0.8-67.tar.gz
if that would help
-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #1.2: l1xl1hya1q2vdr059i00s0q9rpwb846a-foreign_0.8-67.tar.gz --]
[-- Type: application/x-tar-gz, Size: 334175 bytes --]

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

[bug#27906] [PATCH] r-foreign: Update hash and remove duplicate recipe.

[Roel Janssen]

Efraim Flashner writes:

> I have /gnu/store/l1xl1hya1q2vdr059i00s0q9rpwb846a-foreign_0.8-67.tar.gz
> if that would help

Now this is odd:
$ wget http://cran.r-project.org/src/contrib/Archive/foreign/foreign_0.8-67.tar.gz
$ tar axvf l1xl1hya1q2vdr059i00s0q9rpwb846a-foreign_0.8-67.tar.gz 
$ mv foreign foreign-orig
$ tar axvf foreign_0.8-67.tar.gz 
$ mv foreign foreign-new
$ diff -r foreign-orig/ foreign-new/
$

So, no difference?

Let's check the tarball md5 sums:
ab00fa606625711a46c54d772c0cefe8  l1xl1hya1q2vdr059i00s0q9rpwb846a-foreign_0.8-67.tar.gz
896db4d1a62fe09c6ecc12d759492267  foreign_0.8-67.tar.gz

Could anyone confirm that they get a different hash as well?:
guix gc -d /gnu/store/l1xl1hya1q2vdr059i00s0q9rpwb846a-foreign_0.8-67.tar.gz
guix build -S r-foreign --no-substitutes

I get:
From http://cran.r-project.org/src/contrib/Archive/foreign/foreign_0.8-67.tar.gz...
 ...8-67.tar.gz  326KiB             833KiB/s 00:00 [####################] 100.0%
sha256 hash mismatch for output path `/gnu/store/l1xl1hya1q2vdr059i00s0q9rpwb846a-foreign_0.8-67.tar.gz'
  expected: 1mcrm2pydimbyjhkrw5h380bifj1jhwzifph1xgh90asf3lvd1xd
  actual:   0j0z815zyp8n97rk6hlk68d1r8b26vls39s03viq0pnx3cbpwyga
@ build-failed /gnu/store/7wm6w3b4ll9nq35ldchi56mzspz4gsi8-foreign_0.8-67.tar.gz.drv - 1 sha256 hash mismatch for outp
ut path `/gnu/store/l1xl1hya1q2vdr059i00s0q9rpwb846a-foreign_0.8-67.tar.gz'                                          
  expected: 1mcrm2pydimbyjhkrw5h380bifj1jhwzifph1xgh90asf3lvd1xd
  actual:   0j0z815zyp8n97rk6hlk68d1r8b26vls39s03viq0pnx3cbpwyga
guix build: error: build failed: build of `/gnu/store/7wm6w3b4ll9nq35ldchi56mzspz4gsi8-foreign_0.8-67.tar.gz.drv' fail
ed

Thanks in advance!

Kind regards,
Roel Janssen

[bug#27906] [PATCH] r-foreign: Update hash and remove duplicate recipe.

[Ludovic Courtès]

Roel Janssen <roel@gnu.org> skribis:

> Efraim Flashner writes:
>
>> I have /gnu/store/l1xl1hya1q2vdr059i00s0q9rpwb846a-foreign_0.8-67.tar.gz
>> if that would help
>
> Now this is odd:
> $ wget http://cran.r-project.org/src/contrib/Archive/foreign/foreign_0.8-67.tar.gz

The other one is at:

  https://mirror.hydra.gnu.org/file/foreign_0.8-67.tar.gz/sha256/1mcrm2pydimbyjhkrw5h380bifj1jhwzifph1xgh90asf3lvd1xd

The contents are identical per “diff -r --no-dereference”.  However
metadata differs:

--8<---------------cut here---------------start------------->8---
ludo@ribbon /tmp$ tar tvf t.tgz |head
drwxr-xr-x hornik/users      0 2016-09-13 13:04 foreign/
drwxr-xr-x hornik/users      0 2014-03-28 10:08 foreign/po/
-rw-r--r-- hornik/users   5913 2012-10-04 12:33 foreign/po/R-fr.po
-rw-r--r-- hornik/users  27343 2014-03-28 10:08 foreign/po/de.po
-rw-r--r-- hornik/users  49598 2014-03-28 10:08 foreign/po/pl.po
-rw-r--r-- hornik/users   5203 2012-10-11 18:41 foreign/po/R-de.po
-rw-r--r-- hornik/users  28708 2014-03-28 10:08 foreign/po/fr.po
-rw-r--r-- hornik/users  17250 2014-03-28 10:08 foreign/po/foreign.pot
-rw-r--r-- hornik/users   2853 2014-03-28 10:08 foreign/po/R-foreign.pot
-rw-r--r-- hornik/users  10262 2014-03-28 10:08 foreign/po/R-pl.po
ludo@ribbon /tmp$ tar tvf foreign_0.8-67.tar.gz |head
drwxr-xr-x ligges/users      0 2016-09-13 13:04 foreign/
drwxr-xr-x ligges/users      0 2014-03-28 10:08 foreign/po/
-rw-r--r-- ligges/users   5913 2012-10-04 12:33 foreign/po/R-fr.po
-rw-r--r-- ligges/users  27343 2014-03-28 10:08 foreign/po/de.po
-rw-r--r-- ligges/users  49598 2014-03-28 10:08 foreign/po/pl.po
-rw-r--r-- ligges/users   5203 2012-10-11 18:41 foreign/po/R-de.po
-rw-r--r-- ligges/users  28708 2014-03-28 10:08 foreign/po/fr.po
-rw-r--r-- ligges/users  17250 2014-03-28 10:08 foreign/po/foreign.pot
-rw-r--r-- ligges/users   2853 2014-03-28 10:08 foreign/po/R-foreign.pot
-rw-r--r-- ligges/users  10262 2014-03-28 10:08 foreign/po/R-pl.po
--8<---------------cut here---------------end--------------->8---

In short, it’s safe to update the hash.

Ludo’.

bug#27906: [PATCH] r-foreign: Update hash and remove duplicate recipe.

[Roel Janssen]

Ludovic Courtès writes:

> Roel Janssen <roel@gnu.org> skribis:
>
>> Efraim Flashner writes:
>>
>>> I have /gnu/store/l1xl1hya1q2vdr059i00s0q9rpwb846a-foreign_0.8-67.tar.gz
>>> if that would help
>>
>> Now this is odd:
>> $ wget http://cran.r-project.org/src/contrib/Archive/foreign/foreign_0.8-67.tar.gz
>
> The other one is at:
>
>   https://mirror.hydra.gnu.org/file/foreign_0.8-67.tar.gz/sha256/1mcrm2pydimbyjhkrw5h380bifj1jhwzifph1xgh90asf3lvd1xd
>
> The contents are identical per “diff -r --no-dereference”.  However
> metadata differs:
>
> --8<---------------cut here---------------start------------->8---
> ludo@ribbon /tmp$ tar tvf t.tgz |head
> drwxr-xr-x hornik/users      0 2016-09-13 13:04 foreign/
> drwxr-xr-x hornik/users      0 2014-03-28 10:08 foreign/po/
> -rw-r--r-- hornik/users   5913 2012-10-04 12:33 foreign/po/R-fr.po
> -rw-r--r-- hornik/users  27343 2014-03-28 10:08 foreign/po/de.po
> -rw-r--r-- hornik/users  49598 2014-03-28 10:08 foreign/po/pl.po
> -rw-r--r-- hornik/users   5203 2012-10-11 18:41 foreign/po/R-de.po
> -rw-r--r-- hornik/users  28708 2014-03-28 10:08 foreign/po/fr.po
> -rw-r--r-- hornik/users  17250 2014-03-28 10:08 foreign/po/foreign.pot
> -rw-r--r-- hornik/users   2853 2014-03-28 10:08 foreign/po/R-foreign.pot
> -rw-r--r-- hornik/users  10262 2014-03-28 10:08 foreign/po/R-pl.po
> ludo@ribbon /tmp$ tar tvf foreign_0.8-67.tar.gz |head
> drwxr-xr-x ligges/users      0 2016-09-13 13:04 foreign/
> drwxr-xr-x ligges/users      0 2014-03-28 10:08 foreign/po/
> -rw-r--r-- ligges/users   5913 2012-10-04 12:33 foreign/po/R-fr.po
> -rw-r--r-- ligges/users  27343 2014-03-28 10:08 foreign/po/de.po
> -rw-r--r-- ligges/users  49598 2014-03-28 10:08 foreign/po/pl.po
> -rw-r--r-- ligges/users   5203 2012-10-11 18:41 foreign/po/R-de.po
> -rw-r--r-- ligges/users  28708 2014-03-28 10:08 foreign/po/fr.po
> -rw-r--r-- ligges/users  17250 2014-03-28 10:08 foreign/po/foreign.pot
> -rw-r--r-- ligges/users   2853 2014-03-28 10:08 foreign/po/R-foreign.pot
> -rw-r--r-- ligges/users  10262 2014-03-28 10:08 foreign/po/R-pl.po
> --8<---------------cut here---------------end--------------->8---
>
> In short, it’s safe to update the hash.
>
> Ludo’.

Thanks for explaining the differences.  I pushed the hash change as a
separate commit from the removal of the duplicate recipe.

Kind regards,
Roel Janssen

[bug#27906] [PATCH] r-foreign: Update hash and remove duplicate recipe.

[Maxim Cournoyer]

Hi,

Roel Janssen <roel@gnu.org> writes:

> Dear Guix,
>
> It seems we have two (almost identical) package recipes for r-foreign.
> This patch removes one of them.
>
> Also, the upstream tarball seems to have changed, so I updated the
> SHA256 hash.
>
> If someone has the old tarball, we could look at what exactly has
> changed.

Wouldn't the old tarball be available on one of our Hydra servers, as
can be gotten using "guix build -S"?

Maxim