[PATCH] gnu: Update 'geiser' hash and deprecate 'geiser-next'.

[PATCH] gnu: Update 'geiser' hash and deprecate 'geiser-next'.

[Alex Kost]

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

As several people noticed, the release tarball of Geiser 0.9 was updated
in place some time ago.

The story is: Federico found that Geiser 0.9 does not contain some files
for Chibi and Chez, so he let the upstream know about it¹, and added
'geiser-next' package².  Then JAOR (the maintainer of Geiser) updated
0.9 tarball in place.

So since Geiser 0.9 contains those missing files for Chibi and Chez now,
I think we can deprecate 'geiser-next' again (along with updating the
hash of the 'geiser' source tarball), WDYT?

¹ https://github.com/jaor/geiser/issues/188
² http://git.savannah.gnu.org/cgit/guix.git/commit/?id=6af886f492a7718a992226d1c2baac7cae04b407


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Update-geiser-hash-and-deprecate-geiser-next.patch --]
[-- Type: text/x-patch, Size: 2498 bytes --]

From 0ff4e272a1cbd5fd8832e3422dba646838f218cb Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Tue, 29 Nov 2016 22:46:34 +0300
Subject: [PATCH] gnu: Update 'geiser' hash and deprecate 'geiser-next'.

* gnu/packages/emacs.scm (geiser)[source]: Update the hash (the release
tarball was updated in place).
(geiser-next): Deprecate.
---
 gnu/packages/emacs.scm | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index c1f1266..f7dfb32 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -273,7 +273,7 @@ editor (without an X toolkit)" )
                                  "/geiser-" version ".tar.gz"))
              (sha256
               (base32
-               "1n772ysl1dmn0vy3gk230ymyjm14h93zw99y6h2rqp1ixy7v43dm"))))
+               "0phz9d8wjk4p13vqannv0003fwh8qqrp0gfzcs2hgq1mrmv1srss"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (alist-cons-after
@@ -298,36 +298,8 @@ metadata.")
     (license license:bsd-3)))
 
 (define-public geiser-next
-  ;; Geiser's upcoming version supports Chibi and Chez, while it was forgot to
-  ;; include some required files in 0.9.  When the next Geiser release comes
-  ;; out, we can remove this.
-  (let ((commit "16035b9fa475496f7f89a57fa81455057af749a0")
-        (revision "1"))
-    (package
-      (inherit geiser)
-      (name "geiser-next")
-      (version (string-append "0.9-" revision "." (string-take commit 7)))
-      (source (origin
-                (method git-fetch)
-                (file-name (string-append name "-" version ".tar.gz"))
-                (uri (git-reference
-                      (url "git://git.sv.gnu.org/geiser.git")
-                      (commit commit)))
-                (sha256
-                 (base32
-                  "1rrafizrhjkai0msryjiz4c5dcdyihf0i2wmgiy8br74rwbxpyl5"))))
-      (native-inputs
-       `(("autoconf" ,autoconf)
-         ("automake" ,automake)
-         ("texinfo" ,texinfo)
-         ,@(package-native-inputs geiser)))
-      (arguments
-       (substitute-keyword-arguments (package-arguments geiser)
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'autogen
-               (lambda _
-                 (zero? (system* "sh" "autogen.sh")))))))))))
+  ;; This has become "geiser".
+  (deprecated-package "geiser-next" geiser))
 
 (define-public paredit
   (package
-- 
2.10.2

Re: [PATCH] gnu: Update 'geiser' hash and deprecate 'geiser-next'.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> As several people noticed, the release tarball of Geiser 0.9 was updated
> in place some time ago.
>
> The story is: Federico found that Geiser 0.9 does not contain some files
> for Chibi and Chez, so he let the upstream know about it¹, and added
> 'geiser-next' package².  Then JAOR (the maintainer of Geiser) updated
> 0.9 tarball in place.
>
> So since Geiser 0.9 contains those missing files for Chibi and Chez now,
> I think we can deprecate 'geiser-next' again (along with updating the
> hash of the 'geiser' source tarball), WDYT?

Definitely, please push!

Thanks, and sorry for the delay.

Ludo’.

Re: [PATCH] gnu: Update 'geiser' hash and deprecate 'geiser-next'.

[Alex Kost]

Ludovic Courtès (2016-12-07 23:23 +0100) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> As several people noticed, the release tarball of Geiser 0.9 was updated
>> in place some time ago.
>>
>> The story is: Federico found that Geiser 0.9 does not contain some files
>> for Chibi and Chez, so he let the upstream know about it¹, and added
>> 'geiser-next' package².  Then JAOR (the maintainer of Geiser) updated
>> 0.9 tarball in place.
>>
>> So since Geiser 0.9 contains those missing files for Chibi and Chez now,
>> I think we can deprecate 'geiser-next' again (along with updating the
>> hash of the 'geiser' source tarball), WDYT?
>
> Definitely, please push!
>
> Thanks, and sorry for the delay.

No problem, thanks for looking at it!

-- 
Alex