bug#29106: Build loop after changing pulseaudio and emacs-ido-completing-read+

[Oleg Pykhalov]

From 9a012229f41d60610e37639363f3b513a3900465 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <address@hidden>
Date: Wed, 1 Nov 2017 15:58:48 +0300
Subject: [PATCH] gnu: emacs-ido-completing-read+: Update to 4.5.

* gnu/packages/emacs.scm (emacs-ido-completing-read+): Update to 4.5.
---
 gnu/packages/emacs.scm | 59 ++++++++++++++++++++------------------------------
 1 file changed, 23 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index ad96093c3..3607e00cb 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -3777,48 +3777,35 @@ restrict the text width to 80 characters.")
 (define-public emacs-ido-completing-read+
   (package
     (name "emacs-ido-completing-read+")
-    (version "3.12")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://raw.githubusercontent.com";
-                                  "/DarwinAwardWinner/ido-ubiquitous/v"
-                                  version "/ido-completing-read+.el"))
-              (file-name (string-append "ido-completing-read+-" version ".el"))
-              (sha256
-               (base32
-                "1cyalb0p7nfsm4n6n9q6rjmvn6adqc0fq8ybnlj3n41n289dkfjf"))))
+    (version "4.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/";
+                           "DarwinAwardWinner/ido-completing-read-plus"
+                           "/archive/" "v" version ".tar.gz"))
+       (file-name (string-append "ido-completing-read+-" version ".el"))
+       (sha256
+        (base32
+         "00p6j3chyir3avdgbkb05hw4rr5xd1vyljfhn7pg67jx04z5a0f3"))))
     (build-system emacs-build-system)
-    (home-page "https://github.com/DarwinAwardWinner/ido-ubiquitous";)
-    (synopsis "Replacement for completing-read using ido")
+    (propagated-inputs
+     `(("emacs-ido-completing-read+" ,emacs-ido-completing-read+)
+       ("emacs-s" ,emacs-s)
+       ("emacs-memoize" ,emacs-memoize)))
+    (home-page "https://github.com/DarwinAwardWinner/ido-completing-read-plus";)
+    (synopsis "Use ido (nearly) everywhere")
     (description
-     "The ido-completing-read+ function is a wrapper for ido-completing-read.
-Importantly, it detects edge cases that ordinary ido cannot handle and either
-adjusts them so ido can handle them, or else simply falls back to the standard
-Emacs completion function instead.")
+     "@code{emacs-ido-completing-read+} provides ido-style completion for
+almost every function that uses the standard completion function
+completing-read.")
     (license license:gpl3+)))
 
 (define-public emacs-ido-ubiquitous
+  ;; Preserve for people already uses `emacs-ido-ubiquitous'
   (package
-    (name "emacs-ido-ubiquitous")
-    (version "3.12")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://raw.githubusercontent.com";
-                                  "/DarwinAwardWinner/ido-ubiquitous/v"
-                                  version "/ido-ubiquitous.el"))
-              (file-name (string-append "ido-ubiquitous-" version ".el"))
-              (sha256
-               (base32
-                "197ypji0fb6jsdcq40rpnknwlh3imas6s6jbsvkfm0pz9988c3q2"))))
-    (build-system emacs-build-system)
-    (propagated-inputs
-     `(("emacs-ido-completing-read+" ,emacs-ido-completing-read+)))
-    (home-page "https://github.com/DarwinAwardWinner/ido-ubiquitous";)
-    (synopsis "Use ido (nearly) everywhere")
-    (description
-     "Ido-ubiquitous enables ido-style completion for almost every function
-that uses the standard completion function completing-read.")
-  (license license:gpl3+)))
+    (inherit emacs-ido-completing-read+)
+    (name "emacs-ido-ubiquitous")))
 
 (define-public emacs-yaml-mode
   (package
-- 
2.14.3

signature.asc
Description: PGP signature