From 1fda9b1f46fb5fabbc08153b2fdf19c31f873e6c Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 29 Oct 2015 00:07:20 +0300 Subject: gnu: magit: Update to 2.3.0. * gnu/packages/emacs.scm (magit): Update to 2.3.0. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6416b00ee0..ae6d0db612 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -316,7 +316,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") (define-public magit (package (name "magit") - (version "2.2.2") + (version "2.3.0") (source (origin (method url-fetch) (uri (string-append @@ -324,7 +324,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") version "/" name "-" version ".tar.gz")) (sha256 (base32 - "1imkj4prprnivhbpdn1mdpiryxkckzy5hbnqaahv7gixwac1irh8")))) + "0bi0vqp9802f00vnii3x80iqycji20bw4pjysy6al0d86mkggjx5")))) (build-system gnu-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-no-x))) -- cgit v1.2.3 From b7f16845c837e8f640b20df6c9cdeb11690df2f8 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 29 Oct 2015 00:08:03 +0300 Subject: gnu: magit-svn: Update to 2.1.1. * gnu/packages/emacs.scm (magit-svn): Update to 2.1.1. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ae6d0db612..f8be743ce5 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -372,7 +372,7 @@ operations.") (define-public magit-svn (package (name "magit-svn") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (string-append @@ -381,7 +381,7 @@ operations.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "09sz93g7x7g9q75jsw8bdh7yr4jr1igfb4fpg5i302a7l2ahxfr8")))) + "04y88j7q9h8xjbx5dbick6n5nr1522sn9i1znp0qwk3vjb4b5mzz")))) (build-system trivial-build-system) (native-inputs `(("emacs" ,emacs-no-x) ("tar" ,tar) -- cgit v1.2.3 From a124bbd2f41410e1c33654f4ff9865765baf28a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Fri, 13 Nov 2015 22:50:36 +0800 Subject: gnu: Adjust formatting as recommended by 'guix lint'. * gnu/packages/aidc.scm (barcode, qrencode), gnu/packages/bash.scm (bash, bash-completion), gnu/packages/busybox.scm (busybox), gnu/packages/cdrom.scm (cdparanoia), gnu/packages/cmake.scm (cmake), gnu/packages/conkeror.scm (conkeror), gnu/packages/cook.scm (cook), gnu/packages/curl.scm (curl), gnu/packages/docbook.scm (docbook-xsl), gnu/packages/enlightenment.scm (enlightenment), gnu/packages/games.scm (abbaye), gnu/packages/geeqie.scm (exiv2), gnu/packages/gimp.scm (gegl), gnu/packages/gl.scm (glu, freeglut, ftgl), gnu/packages/glib.scm (glib), gnu/packages/gnome.scm (orbit2, gconf, geocode-glib), gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base), gnu/packages/linux.scm (util-linux), gnu/packages/lisp.scm (gcl, ecl), gnu/packages/maths.scm (gnuplot, hdf5), gnu/packages/ssh.scm (dropbear), gnu/packages/web.scm (json-c): Remove tabulations and trailing white spaces or reformat to fit within 80 columns. * gnu/packages/audio.scm (aubio), gnu/packages/emacs.scm (emacs-s), gnu/packages/engineering.scm (geda-gaf), gnu/packages/games.scm (dosbox), gnu/packages/gnome.scm (gusb), gnu/packages/gtk.scm (gtk+), gnu/packages/guile.scm (guile-wisp), gnu/packages/hurd.scm (hurd-headers), gnu/packages/wm.scm (i3-wm): Adjust synopsis or description. --- gnu/packages/emacs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index f8be743ce5..67f1ea20ef 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -1023,7 +1023,7 @@ and stored in memory.") (lambda _ (zero? (system* "./run-tests.sh"))))))) (home-page "https://github.com/magnars/s.el") - (synopsis "Emacs string manipulation library.") + (synopsis "Emacs string manipulation library") (description "This package provides an Emacs library for manipulating strings.") (license license:gpl3+))) -- cgit v1.2.3 From eccd0b57a1f05b3caca28604f4d2c06556e2fe05 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Wed, 2 Dec 2015 22:50:55 +0300 Subject: gnu: emacs-pdf-tools: Update to 0.70. * gnu/packages/emacs.scm (emacs-pdf-tools): Update to 0.70. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 67f1ea20ef..84c5c44d27 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -911,7 +911,7 @@ single buffer.") (define-public emacs-pdf-tools (package (name "emacs-pdf-tools") - (version "0.60") + (version "0.70") (source (origin (method url-fetch) (uri (string-append @@ -920,7 +920,7 @@ single buffer.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1y8k5n2jbyaxby0j6f4m9xbm0ddpmbkrfj6rp6ll5sb97lcg3vrx")))) + "1m0api6wiawswyk46bdsyk6r5rg3b86a4paar6nassm6x6c6vr77")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there are no tests -- cgit v1.2.3 From fae2a30f135cd0a80bdafff591a713f6c3989700 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Wed, 2 Dec 2015 22:51:44 +0300 Subject: gnu: emacs-dash: Update to 2.12.1. * gnu/packages/emacs.scm (emacs-dash): Update to 2.12.1. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 84c5c44d27..e8b9ed68d4 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -980,7 +980,7 @@ and stored in memory.") (define-public emacs-dash (package (name "emacs-dash") - (version "2.11.0") + (version "2.12.1") (source (origin (method url-fetch) (uri (string-append @@ -989,7 +989,7 @@ and stored in memory.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1piwcwilkxcbjxx832mhb7q3pz1fgwp203r581bpqcw6kd5x726q")))) + "082jl7mp4x063bpj5ad2pc5125k0d6p7rb89gcj7ny3lma9h2ij1")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 509a0c2700dbaaa3e060c1f794ba5a58f0e8bd31 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Wed, 2 Dec 2015 22:52:39 +0300 Subject: gnu: magit: Update to 2.3.1. * gnu/packages/emacs.scm (magit): Update to 2.3.1. --- gnu/packages/emacs.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e8b9ed68d4..402089831c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -316,7 +316,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") (define-public magit (package (name "magit") - (version "2.3.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append @@ -324,7 +324,7 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.") version "/" name "-" version ".tar.gz")) (sha256 (base32 - "0bi0vqp9802f00vnii3x80iqycji20bw4pjysy6al0d86mkggjx5")))) + "1wnx034adkwhbsydd10il2099hpzz351kp39sri8s1yd43f795gf")))) (build-system gnu-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-no-x))) -- cgit v1.2.3 From c181b870f1e72b30931f3cefd0ee6a010e2ae762 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Wed, 2 Dec 2015 22:53:24 +0300 Subject: gnu: paredit: Update to 24. * gnu/packages/emacs.scm (paredit): Update to 24. --- gnu/packages/emacs.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 402089831c..947ddcb798 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -226,13 +226,14 @@ metadata.") (define-public paredit (package (name "paredit") - (version "23") + (version "24") (source (origin - (method url-fetch) - (uri (string-append "http://mumble.net/~campbell/emacs/paredit-" - version ".el")) - (sha256 - (base32 "1np882jzvxckljx3cjz4absyzmc5hw65cs21sjmbic82163m9lf8")))) + (method url-fetch) + (uri (string-append "http://mumble.net/~campbell/emacs/paredit-" + version ".el")) + (sha256 + (base32 + "0pp3n8q6kc70blqsaw0zlzp6bc327dpgdrjr0cnh7hqg1lras7ka")))) (build-system trivial-build-system) (inputs `(("emacs" ,emacs-no-x))) (arguments -- cgit v1.2.3 From 932ece6553b6a8e9062ed16c7b2b11848c8f544e Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Wed, 2 Dec 2015 22:47:48 +0300 Subject: gnu: emacs-w3m: Use 'modify-syntax'. * gnu/packages/emacs.scm (emacs-w3m)[arguments]: Use 'modify-syntax'. --- gnu/packages/emacs.scm | 67 +++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 34 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 947ddcb798..e0c986ee46 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -600,40 +600,39 @@ provides an optional IDE-like error list.") out "/share/images/emacs-w3m"))) #:tests? #f ; no check target #:phases - (alist-cons-after - 'unpack 'autoconf - (lambda _ - (zero? (system* "autoconf"))) - (alist-cons-before - 'build 'patch-exec-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (w3m (assoc-ref inputs "w3m")) - (imagemagick (assoc-ref inputs "imagemagick")) - (coreutils (assoc-ref inputs "coreutils"))) - (emacs-substitute-variables "w3m.el" - ("w3m-command" (string-append w3m "/bin/w3m")) - ("w3m-touch-command" (string-append coreutils "/bin/touch")) - ("w3m-image-viewer" (string-append imagemagick "/bin/display")) - ("w3m-icon-directory" (string-append out - "/share/images/emacs-w3m"))) - (emacs-substitute-variables "w3m-image.el" - ("w3m-imagick-convert-program" (string-append imagemagick - "/bin/convert")) - ("w3m-imagick-identify-program" (string-append imagemagick - "/bin/identify"))) - #t)) - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (and (zero? (system* "make" "install" "install-icons")) - (with-directory-excursion - (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp") - (for-each delete-file '("ChangeLog" "ChangeLog.1")) - (symlink "w3m-load.el" "w3m-autoloads.el") - #t))) - %standard-phases))))) + (modify-phases %standard-phases + (add-after 'unpack 'autoconf + (lambda _ + (zero? (system* "autoconf")))) + (add-before 'build 'patch-exec-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (w3m (assoc-ref inputs "w3m")) + (imagemagick (assoc-ref inputs "imagemagick")) + (coreutils (assoc-ref inputs "coreutils"))) + (emacs-substitute-variables "w3m.el" + ("w3m-command" (string-append w3m "/bin/w3m")) + ("w3m-touch-command" + (string-append coreutils "/bin/touch")) + ("w3m-image-viewer" + (string-append imagemagick "/bin/display")) + ("w3m-icon-directory" + (string-append out "/share/images/emacs-w3m"))) + (emacs-substitute-variables "w3m-image.el" + ("w3m-imagick-convert-program" + (string-append imagemagick "/bin/convert")) + ("w3m-imagick-identify-program" + (string-append imagemagick "/bin/identify"))) + #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (and (zero? (system* "make" "install" "install-icons")) + (with-directory-excursion + (string-append (assoc-ref outputs "out") + "/share/emacs/site-lisp") + (for-each delete-file '("ChangeLog" "ChangeLog.1")) + (symlink "w3m-load.el" "w3m-autoloads.el") + #t))))))) (home-page "http://emacs-w3m.namazu.org/") (synopsis "Simple Web browser for Emacs based on w3m") (description -- cgit v1.2.3 From 2e74b9f4cfc7389b43991f2ce24d53da286b0546 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Wed, 2 Dec 2015 22:49:44 +0300 Subject: gnu: emacs-w3m: Update to 1.4.538+0.20141022. * gnu/packages/emacs.scm (emacs-w3m): Update to 1.4.538+0.20141022. [arguments]: Use '--without-compress-install' configure flag. --- gnu/packages/emacs.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/packages/emacs.scm') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e0c986ee46..7d95f55327 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -574,13 +574,14 @@ provides an optional IDE-like error list.") (define-public emacs-w3m (package (name "emacs-w3m") - (version "1.4.483+0.20120614") + (version "1.4.538+0.20141022") (source (origin (method url-fetch) (uri (string-append "mirror://debian/pool/main/w/w3m-el/w3m-el_" version ".orig.tar.gz")) (sha256 - (base32 "0ms181gjavnfk79hhv5xl9llik4c6kj0w3c04kgyif8lcy2sxljx")))) + (base32 + "0zfxmq86pwk64yv0426gnjrvhjrgrjqn08sdcdhmmjmfpmqvm79y")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf))) (inputs `(("w3m" ,w3m) @@ -597,7 +598,11 @@ provides an optional IDE-like error list.") (list (string-append "--with-lispdir=" out "/share/emacs/site-lisp") (string-append "--with-icondir=" - out "/share/images/emacs-w3m"))) + out "/share/images/emacs-w3m") + ;; Leave .el files uncompressed, otherwise GC can't + ;; identify run-time dependencies. See + ;; + "--without-compress-install")) #:tests? #f ; no check target #:phases (modify-phases %standard-phases -- cgit v1.2.3