Remove geiser-next after updating geiser?

Remove geiser-next after updating geiser?

[Alex Kost]

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

Hello, there is a new Geiser release (v0.9).  So the question is: should
'geiser-next' be removed after updating 'geiser'?  (as in the attached
patches)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-geiser-Update-to-0.9.patch --]
[-- Type: text/x-patch, Size: 1118 bytes --]

From 5424f4945801dfdd9083a4985bf77b3ebef90b90 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Fri, 7 Oct 2016 12:01:07 +0300
Subject: [PATCH 1/2] gnu: geiser: Update to 0.9.

* gnu/packages/emacs.scm (geiser): Update to 0.9.
---
 gnu/packages/emacs.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 4a20f0c..2bcce2b 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -266,14 +266,14 @@ editor (without an X toolkit)" )
 (define-public geiser
   (package
     (name "geiser")
-    (version "0.8.1")
+    (version "0.9")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://savannah/geiser/" version
                                  "/geiser-" version ".tar.gz"))
              (sha256
               (base32
-               "163zh8qf1q8l485d94a51a9xixirj8r2xvrbgxyw06vkaqrz5qvc"))))
+               "1n772ysl1dmn0vy3gk230ymyjm14h93zw99y6h2rqp1ixy7v43dm"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (alist-cons-after
-- 
2.9.2


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-geiser-next-Remove.patch --]
[-- Type: text/x-patch, Size: 1873 bytes --]

From a188e5e12ac666f46c659c3e4330c7ec207b5557 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Fri, 7 Oct 2016 12:01:30 +0300
Subject: [PATCH 2/2] gnu: geiser-next: Remove.

* gnu/packages/emacs.scm (geiser-next): Remove.
---
 gnu/packages/emacs.scm | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 2bcce2b..6576a08 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -297,36 +297,6 @@ implementation, Emacs and, ultimately, the schemer, giving them access to live
 metadata.")
     (license license:bsd-3)))
 
-(define-public geiser-next
-  ;; Geiser's upcoming version supports guile-next, and 0.8.1 does not.
-  ;; When the next Geiser release comes out, we can remove this.
-  (let ((commit "2e335695fc1a4a0b520b50deb761b958194cbec4"))
-    (package
-      (inherit geiser)
-      (name "geiser-next")
-      (version (string-append "0.8.1-1"
-                              (string-take commit 7)))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "git://git.sv.gnu.org/geiser.git")
-                      (commit commit)))
-                (sha256
-                 (base32
-                  "00rmpn8zncq1fiah5m12l26z0s28bh7ql63kxdvksqdgfrisnmgf"))))
-      (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")))))))))))
-
 (define-public paredit
   (package
     (name "emacs-paredit")
-- 
2.9.2

Re: Remove geiser-next after updating geiser?

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> From 5424f4945801dfdd9083a4985bf77b3ebef90b90 Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> Date: Fri, 7 Oct 2016 12:01:07 +0300
> Subject: [PATCH 1/2] gnu: geiser: Update to 0.9.
>
> * gnu/packages/emacs.scm (geiser): Update to 0.9.

Yeah!

> From a188e5e12ac666f46c659c3e4330c7ec207b5557 Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> Date: Fri, 7 Oct 2016 12:01:30 +0300
> Subject: [PATCH 2/2] gnu: geiser-next: Remove.
>
> * gnu/packages/emacs.scm (geiser-next): Remove.

To be safe, I’d make it:

  (define-public geiser-next
    ;; This has become “geiser”.
    (deprecated-package "geiser-next" geiser))

That way ‘guix package -u’ will DTRT.

Thanks,
Ludo’.

Re: Remove geiser-next after updating geiser?

[Alex Kost]

Ludovic Courtès (2016-10-07 14:48 +0200) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> From 5424f4945801dfdd9083a4985bf77b3ebef90b90 Mon Sep 17 00:00:00 2001
>> From: Alex Kost <alezost@gmail.com>
>> Date: Fri, 7 Oct 2016 12:01:07 +0300
>> Subject: [PATCH 1/2] gnu: geiser: Update to 0.9.
>>
>> * gnu/packages/emacs.scm (geiser): Update to 0.9.
>
> Yeah!
>
>> From a188e5e12ac666f46c659c3e4330c7ec207b5557 Mon Sep 17 00:00:00 2001
>> From: Alex Kost <alezost@gmail.com>
>> Date: Fri, 7 Oct 2016 12:01:30 +0300
>> Subject: [PATCH 2/2] gnu: geiser-next: Remove.
>>
>> * gnu/packages/emacs.scm (geiser-next): Remove.
>
> To be safe, I’d make it:
>
>   (define-public geiser-next
>     ;; This has become “geiser”.
>     (deprecated-package "geiser-next" geiser))
>
> That way ‘guix package -u’ will DTRT.

Done, thanks!

-- 
Alex