[bug#32860] [PATCH] gnu: pocl: Update to 1.2.

[bug#32860] [PATCH] gnu: pocl: Update to 1.2.

[fis trivial]

* gnu/packages/opencl.scm (pocl): Update to 1.2.
---
 gnu/packages/opencl.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm
index d32e69643..0df4b2e1c 100644
--- a/gnu/packages/opencl.scm
+++ b/gnu/packages/opencl.scm
@@ -294,23 +294,23 @@ back-end for the LLVM compiler framework.")
 (define-public pocl
   (package
     (name "pocl")
-    (version "1.1")
+    (version "1.2")
     (source
      (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/pocl/pocl.git")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/pocl/pocl/archive/v"
+             version".tar.gz"))
        (sha256
-        (base32 "1z3sqn20ddv1030adchpzs65qng436gc2mb99p213mkh95jkh1l5"))))
+        (base32 "0iidk05lac83kj3zfxyvpqlza4ljknwvw6ds9jkg74k86f7ychqc"))
+       (file-name (string-append name "-" version ".tar.gz"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("libltdl" ,libltdl)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("clang" ,clang)
-       ("hwloc" ,hwloc "lib")
+       ("hwloc" ,hwloc-2.0 "lib")
        ("llvm" ,llvm)
        ("ocl-icd" ,ocl-icd)))
     (arguments
--
2.19.0

[bug#32860] [PATCH] gnu: pocl: Update to 1.2.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 803 bytes --]

On Fri, Sep 28, 2018 at 10:06:30AM +0000, fis trivial wrote:
> * gnu/packages/opencl.scm (pocl): Update to 1.2.

Thanks!

>      (source
>       (origin
> -       (method git-fetch)
> -       (uri (git-reference
> -             (url "https://github.com/pocl/pocl.git")
> -             (commit (string-append "v" version))))
> -       (file-name (git-file-name name version))
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://github.com/pocl/pocl/archive/v"
> +             version".tar.gz"))

Is there a particular reason to use the tarball instead of the Git repo
here? I ask because Github's autogenerated tarballs are subject to
change [0], which is annoying, whereas the Git repo should be
bit-identical forever.

[0] https://github.com/libgit2/libgit2/issues/4343

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

[bug#32860] [PATCH] gnu: pocl: Update to 1.2.

[fis trivial]

Leo Famulari writes:

> On Fri, Sep 28, 2018 at 10:06:30AM +0000, fis trivial wrote:
>> * gnu/packages/opencl.scm (pocl): Update to 1.2.
>
> Thanks!
>
>>      (source
>>       (origin
>> -       (method git-fetch)
>> -       (uri (git-reference
>> -             (url "https://github.com/pocl/pocl.git")
>> -             (commit (string-append "v" version))))
>> -       (file-name (git-file-name name version))
>> +       (method url-fetch)
>> +       (uri (string-append
>> +             "https://github.com/pocl/pocl/archive/v"
>> +             version".tar.gz"))
>
> Is there a particular reason to use the tarball instead of the Git repo
> here? I ask because Github's autogenerated tarballs are subject to
> change [0], which is annoying, whereas the Git repo should be
> bit-identical forever.
>
> [0] https://github.com/libgit2/libgit2/issues/4343

Oh, sorry I didn't know about that.  Tarball feels cleaner than setting up a
git repo (just a feeling).  I will send another patch using git soon.

But isn't those tarball now everywhere in Guix?  It would be a huge headache.

--
Jiaming

[bug#32860] [PATCH] gnu: pocl: Update to 1.2.

[fis trivial]

* gnu/packages/opencl.scm (pocl): Update to 1.2.
---
 gnu/packages/opencl.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm
index d32e69643..da979253b 100644
--- a/gnu/packages/opencl.scm
+++ b/gnu/packages/opencl.scm
@@ -294,23 +294,23 @@ back-end for the LLVM compiler framework.")
 (define-public pocl
   (package
     (name "pocl")
-    (version "1.1")
+    (version "1.2")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/pocl/pocl.git")
              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
        (sha256
-        (base32 "1z3sqn20ddv1030adchpzs65qng436gc2mb99p213mkh95jkh1l5"))))
+        (base32 "0fyiwd9nrqhl0jsac0bx17p9acpfzhyxp50mmp28mzn7psb9qidg"))
+       (file-name (git-file-name name version))))
     (build-system cmake-build-system)
     (native-inputs
      `(("libltdl" ,libltdl)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("clang" ,clang)
-       ("hwloc" ,hwloc "lib")
+       ("hwloc" ,hwloc-2.0 "lib")
        ("llvm" ,llvm)
        ("ocl-icd" ,ocl-icd)))
     (arguments
--
2.19.0

[bug#32860] [PATCH] gnu: pocl: Update to 1.2.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1401 bytes --]

On Sat, Sep 29, 2018 at 01:26:03AM +0000, fis trivial wrote:
> Oh, sorry I didn't know about that.  Tarball feels cleaner than setting up a
> git repo (just a feeling).  I will send another patch using git soon.

Yeah, I agree with you. Git is a huge and complicated package. It's
annoying that the packages depend on it.

> But isn't those tarball now everywhere in Guix?  It would be a huge headache.

Yes. Previously we favored the GitHub tarballs, but in September 2017
GitHub caused a large number of them to change, and it was a big
headache for us and many other distros.

GitHub's recommendation is to use Git checkouts or for upstream projects
to upload their own tarballs to their project's GitHub release page. [0]
GitHub doesn't guarantee their automatically generated tarballs will
remain identical in the future.

So, for packages where the upstream maintainers do not upload their own
tarballs, we are slowly changing our package definitions to use Git
checkouts.

[0] You can see an example of the difference between the upstream
project's own tarballs, and the tarballs automatically generated by
GitHub, on the Borg release page:

https://github.com/borgbackup/borg/releases

The file named 'Source code (tar.gz)' is automatically created by
GitHub. It may change in the future. The file named
'borgbackup-1.1.7.tar.gz' is uploaded by Borg's maintainers, and it
should never change.

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

bug#32860: [PATCH] gnu: pocl: Update to 1.2.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 180 bytes --]

On Sat, Sep 29, 2018 at 04:05:15AM +0000, fis trivial wrote:
> 
> * gnu/packages/opencl.scm (pocl): Update to 1.2.

Thanks! Pushed as bfb22078fd3a184f60968938851ada97d7dead58

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

[bug#32860] [PATCH] gnu: pocl: Update to 1.2.

[fis trivial]

Thanks for the detailed explanation, sometimes it's quite rewarding to
contribute. :)

Leo Famulari writes:

> On Sat, Sep 29, 2018 at 01:26:03AM +0000, fis trivial wrote:
>> Oh, sorry I didn't know about that.  Tarball feels cleaner than setting up a
>> git repo (just a feeling).  I will send another patch using git soon.
>
> Yeah, I agree with you. Git is a huge and complicated package. It's
> annoying that the packages depend on it.
>
>> But isn't those tarball now everywhere in Guix?  It would be a huge headache.
>
> Yes. Previously we favored the GitHub tarballs, but in September 2017
> GitHub caused a large number of them to change, and it was a big
> headache for us and many other distros.
>
> GitHub's recommendation is to use Git checkouts or for upstream projects
> to upload their own tarballs to their project's GitHub release page. [0]
> GitHub doesn't guarantee their automatically generated tarballs will
> remain identical in the future.
>
> So, for packages where the upstream maintainers do not upload their own
> tarballs, we are slowly changing our package definitions to use Git
> checkouts.
>
> [0] You can see an example of the difference between the upstream
> project's own tarballs, and the tarballs automatically generated by
> GitHub, on the Borg release page:
>
> https://github.com/borgbackup/borg/releases
>
> The file named 'Source code (tar.gz)' is automatically created by
> GitHub. It may change in the future. The file named
> 'borgbackup-1.1.7.tar.gz' is uploaded by Borg's maintainers, and it
> should never change.

Jiaming