[bug#34190] gnu: clojure: Update to 1.10.0.

Message ID 20190124124831.11598-1-mthl@gnu.org
State Accepted
Commit 9e532ae22a2064298dbfbd45c0fa07e290520818
Headers show
Series [bug#34190] gnu: clojure: Update to 1.10.0. | expand

Checks

Context Check Description
cbaines/applying patch success Successfully applied

Commit Message

Mathieu Lirzin Jan. 24, 2019, 12:48 p.m. UTC
* gnu/packages/clojure.scm (clojure): Update to 1.10.0.
[source]: Use 'git-fetch'.
---
 gnu/packages/clojure.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

Comments

Ricardo Wurmus Jan. 24, 2019, 8:10 p.m. UTC | #1
Hi Mathieu,

> * gnu/packages/clojure.scm (clojure): Update to 1.10.0.
> [source]: Use 'git-fetch'.
> ---
>  gnu/packages/clojure.scm | 19 ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm
> index 1dba4cef87..8112b65278 100644
> --- a/gnu/packages/clojure.scm
> +++ b/gnu/packages/clojure.scm
> @@ -65,15 +65,16 @@
>  
>      (package
>        (name "clojure")
> -      (version "1.9.0")
> -      (source
> -       (origin
> -         (method url-fetch)
> -         (uri
> -          (string-append "https://github.com/clojure/clojure/archive/clojure-"
> -                         version ".tar.gz"))
> -         (sha256
> -          (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha"))))
> +      (version "1.10.0")
> +      (source (let ((name+version (string-append name "-" version)))
> +                (origin
> +                  (method git-fetch)
> +                  (uri (git-reference
> +                        (url "https://github.com/clojure/clojure")
> +                        (commit name+version)))
> +                  (file-name (string-append name+version "-checkout"))
> +                  (sha256
> +                   (base32 "1kcyv2836acs27vi75hvf3r773ahv2nlh9b3j9xa9m9sdanz1h83")))))
>        (build-system ant-build-system)
>        (arguments
>         `(#:imported-modules ((guix build clojure-utils)

This looks good to me.  Thanks!
Mathieu Lirzin Jan. 24, 2019, 8:35 p.m. UTC | #2
Hello Ricardo,

Ricardo Wurmus <rekado@elephly.net> writes:

>> * gnu/packages/clojure.scm (clojure): Update to 1.10.0.
>> [source]: Use 'git-fetch'.
>> ---
>>  gnu/packages/clojure.scm | 19 ++++++++++---------
>>  1 file changed, 10 insertions(+), 9 deletions(-)
>>
>> diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm
>> index 1dba4cef87..8112b65278 100644
>> --- a/gnu/packages/clojure.scm
>> +++ b/gnu/packages/clojure.scm
>> @@ -65,15 +65,16 @@
[...]
>
> This looks good to me.  Thanks!

Thanks for your impressively reliable stewardship!
Ricardo Wurmus Jan. 29, 2019, 9:59 a.m. UTC | #3
Ricardo Wurmus <rekado@elephly.net> writes:

> Hi Mathieu,
>
>> * gnu/packages/clojure.scm (clojure): Update to 1.10.0.
>> [source]: Use 'git-fetch'.
[…]
> This looks good to me.  Thanks!

Pushed to “master” with commit 9e532ae22.

--
Ricardo

Patch

diff --git a/gnu/packages/clojure.scm b/gnu/packages/clojure.scm
index 1dba4cef87..8112b65278 100644
--- a/gnu/packages/clojure.scm
+++ b/gnu/packages/clojure.scm
@@ -65,15 +65,16 @@ 
 
     (package
       (name "clojure")
-      (version "1.9.0")
-      (source
-       (origin
-         (method url-fetch)
-         (uri
-          (string-append "https://github.com/clojure/clojure/archive/clojure-"
-                         version ".tar.gz"))
-         (sha256
-          (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha"))))
+      (version "1.10.0")
+      (source (let ((name+version (string-append name "-" version)))
+                (origin
+                  (method git-fetch)
+                  (uri (git-reference
+                        (url "https://github.com/clojure/clojure")
+                        (commit name+version)))
+                  (file-name (string-append name+version "-checkout"))
+                  (sha256
+                   (base32 "1kcyv2836acs27vi75hvf3r773ahv2nlh9b3j9xa9m9sdanz1h83")))))
       (build-system ant-build-system)
       (arguments
        `(#:imported-modules ((guix build clojure-utils)