From 089a2c51ff4d4d8ddd180001b25535019c0d35c0 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Mon, 25 Feb 2019 18:42:55 +0100 Subject: gnu: Add emacs-amx. * gnu/packages/emacs-xyz.scm (emacs-amx): New variable. --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 871721af3a..1a8ca3bf9e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13183,3 +13183,27 @@ used to link to certain Magit buffers. Use the command Later you can insert it into an Org buffer using the command @code{org-insert-link}.") (license license:gpl3+)))) + +(define-public emacs-amx + (package + (name "emacs-amx") + (version "3.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DarwinAwardWinner/amx") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bb8y1dmzyqkrb4mg6zndcsxppby3glridv2aap2pv05gv8kx7mj")))) + (build-system emacs-build-system) + (propagated-inputs `(("emacs-s" ,emacs-s))) + (home-page "https://github.com/DarwinAwardWinner/amx") + (synopsis "Alternative interface for M-x") + (description "Amx is an alternative interface for M-x in Emacs. It +provides several enhancements over the ordinary +@code{execute-extended-command}, such as prioritizing your most-used commands +in the completion list and showing keyboard shortcuts, and it supports several +completion systems for selecting commands, such as ido and ivy.") + (license license:gpl3+))) -- cgit v1.2.3 From d97283c3a62b1e8ebdac5544b3fcb5eacc330bcd Mon Sep 17 00:00:00 2001 From: Dimakakos Dimos Date: Fri, 22 Feb 2019 15:27:45 +0200 Subject: gnu: emacs-projectile: Update to 2.0.0 * gnu/packages/emacs-xyz.scm (emacs-projectile): Update to 2.0.0. Signed-off-by: Efraim Flashner --- gnu/packages/emacs-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1a8ca3bf9e..91393a4a57 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2018, 2019 Brett Gilio +;;; Copyright © 2019 Dimakakos Dimos ;;; ;;; This file is part of GNU Guix. ;;; @@ -4448,7 +4449,7 @@ like @code{org-edit-src-code} but for arbitrary regions.") (define-public emacs-projectile (package (name "emacs-projectile") - (version "0.14.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (string-append "https://raw.githubusercontent.com/bbatsov" @@ -4456,7 +4457,7 @@ like @code{org-edit-src-code} but for arbitrary regions.") (file-name (string-append "projectile-" version ".el")) (sha256 (base32 - "1ql1wnzhblbwnv66hf2y0wq45g71hh6s9inc090lmhm1vgylbd1f")))) + "149hablms6n9b4wp78dz4pjz1rzyylfw9ayghq5p9d7k661mvyby")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From 933d810e164b5360a779c9904a707980e378ef74 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 27 Feb 2019 17:09:22 +0100 Subject: gnu: emacs-disk-usage: Update to 1.2.0. * gnu/packages/emacs-xyz.scm (emacs-disk-usage): Update to 1.2.0. --- gnu/packages/emacs-xyz.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 91393a4a57..6fc7e29a8d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13140,17 +13140,18 @@ opposed to character-based).") (define-public emacs-disk-usage (package (name "emacs-disk-usage") - (version "1.1.0") - (home-page "https://gitlab.com/ambrevar/emacs-disk-usage.git") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1c9jmjn8vf0v4776v79pc5w0labfs4v9aysbv2w9423rg4mangbg")))) + (version "1.2.0") + (home-page "https://gitlab.com/Ambrevar/emacs-disk-usage") + (source + (origin + (method url-fetch) + (uri (string-append + "https://elpa.gnu.org/packages/disk-usage-" + version + ".el")) + (sha256 + (base32 + "13n6bsrz8q07fl6sd7wi5zvf01m5xw11hmrpdz7wcn49v6vs3whl")))) (build-system emacs-build-system) (synopsis "Sort and browse disk usage listings with Emacs") (description "Disk Usage is a file system analyzer: it offers a tabulated -- cgit v1.2.3 From b8098cc6916714bb182a302cd3c9d5041d5ef162 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 25 Feb 2019 14:35:14 +0100 Subject: gnu: Move espeak to speech.scm. * gnu/packages/audio.scm (espeak): Move from here ... * gnu/packages/speech.scm (espeak): ... to here. --- gnu/packages/audio.scm | 53 ------------------------------------------- gnu/packages/emacs-xyz.scm | 1 + gnu/packages/speech.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 53 deletions(-) (limited to 'gnu/packages/emacs-xyz.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 17feeafff2..8962f0b4b9 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -624,59 +624,6 @@ guitar amplification and a small range of classic effects, signal processors and generators of mostly elementary and occasionally exotic nature.") (license license:gpl3+))) -(define-public espeak - (package - (name "espeak") - (version "1.48.04") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/espeak/espeak/" - "espeak-" (version-major+minor version) - "/espeak-" version "-source.zip")) - (sha256 - (base32 - "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz")) - (modules '((guix build utils))) - (snippet - ;; remove prebuilt binaries - '(begin - (delete-file-recursively "linux_32bit") - #t)))) - (build-system gnu-build-system) - (arguments - `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - (string-append "DATADIR=" - (assoc-ref %outputs "out") - "/share/espeak-data") - (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") - "/lib") - "AUDIO=pulseaudio") - #:tests? #f ; no check target - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda _ - (chdir "src") - ;; We use version 19 of the PortAudio library, so we must copy the - ;; corresponding file to be sure that espeak compiles correctly. - (copy-file "portaudio19.h" "portaudio.h") - (substitute* "Makefile" - (("/bin/ln") "ln")) - #t))))) - (inputs - `(("portaudio" ,portaudio) - ("pulseaudio" ,pulseaudio))) - (native-inputs `(("unzip" ,unzip))) - (home-page "http://espeak.sourceforge.net/") - (synopsis "Software speech synthesizer") - (description "eSpeak is a software speech synthesizer for English and -other languages. eSpeak uses a \"formant synthesis\" method. This allows many -languages to be provided in a small size. The speech is clear, and can be used -at high speeds, but is not as natural or smooth as larger synthesizers which are -based on human speech recordings.") - (license license:gpl3+))) - (define-public infamous-plugins (package (name "infamous-plugins") diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6fc7e29a8d..36cc005549 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -111,6 +111,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pdf) #:use-module (gnu packages scheme) + #:use-module (gnu packages speech) #:use-module (gnu packages xiph) #:use-module (gnu packages mp3) #:use-module (gnu packages gettext) diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 5f937f64f9..83792277b4 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Marius Bakke ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,10 +24,12 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages pkg-config) @@ -34,6 +37,59 @@ #:use-module (gnu packages python) #:use-module (gnu packages textutils)) +(define-public espeak + (package + (name "espeak") + (version "1.48.04") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/espeak/espeak/" + "espeak-" (version-major+minor version) + "/espeak-" version "-source.zip")) + (sha256 + (base32 + "0n86gwh9pw0jqqpdz7mxggllfr8k0r7pc67ayy7w5z6z79kig6mz")) + (modules '((guix build utils))) + (snippet + ;; remove prebuilt binaries + '(begin + (delete-file-recursively "linux_32bit") + #t)))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "DATADIR=" + (assoc-ref %outputs "out") + "/share/espeak-data") + (string-append "LDFLAGS=-Wl,-rpath=" + (assoc-ref %outputs "out") + "/lib") + "AUDIO=pulseaudio") + #:tests? #f ; no check target + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (chdir "src") + ;; We use version 19 of the PortAudio library, so we must copy the + ;; corresponding file to be sure that espeak compiles correctly. + (copy-file "portaudio19.h" "portaudio.h") + (substitute* "Makefile" + (("/bin/ln") "ln")) + #t))))) + (inputs + `(("portaudio" ,portaudio) + ("pulseaudio" ,pulseaudio))) + (native-inputs `(("unzip" ,unzip))) + (home-page "http://espeak.sourceforge.net/") + (synopsis "Software speech synthesizer") + (description "eSpeak is a software speech synthesizer for English and +other languages. eSpeak uses a \"formant synthesis\" method. This allows many +languages to be provided in a small size. The speech is clear, and can be used +at high speeds, but is not as natural or smooth as larger synthesizers which are +based on human speech recordings.") + (license license:gpl3+))) + (define-public mitlm (package (name "mitlm") -- cgit v1.2.3