diff options
Diffstat (limited to 'gnu/packages/emacs.scm')
-rw-r--r-- | gnu/packages/emacs.scm | 74 |
1 files changed, 62 insertions, 12 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 81e6885f66..c2c162c75c 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2016, 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> -;;; Copyright © 2016, 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2016, 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2016, 2017, 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net> @@ -614,7 +614,7 @@ process, passing on the arguments as command line arguments.") 'build 'pre-build (lambda* (#:key inputs #:allow-other-keys) (define (el-dir store-dir) - (match (find-files store-dir) + (match (find-files store-dir "\\.el$") ((f1 f2 ...) (dirname f1)) (_ ""))) @@ -2990,14 +2990,14 @@ package provides a light and a dark variant.") (define-public emacs-ahungry-theme (package (name "emacs-ahungry-theme") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/ahungry-theme-" version ".tar")) (sha256 (base32 - "14dhnrlbjzrxk5ligf0z2im5bgnxpjqqzqcrmqg5355xrgpbpb7v")))) + "14q5yw56n82qph09bk7wmj5b1snhh9w0nk5s1l7yn9ldg71xq6pm")))) (build-system emacs-build-system) (home-page "https://github.com/ahungry/color-theme-ahungry") (synopsis "Ahungry color theme for Emacs") @@ -3546,6 +3546,7 @@ It is recommended to use @code{clojure-mode} with paredit or smartparens.") (uri (string-append "https://github.com/cask/epl/archive/" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1511n3a3f5gvaf2b4nh018by61ciyzi3y3603fzqma7p9hrckarc")))) @@ -4300,6 +4301,7 @@ CIDER).") (uri (git-reference (url "https://github.com/joaotavora/sly.git") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 "0ib4q4k3h3qn88pymyjjmlmnpizdn1mfg5gpk5a715nqsgxlg09l")))) @@ -4492,14 +4494,14 @@ passive voice.") (name "emacs-org") ;; emacs-org-contrib inherits from this package. Please update its sha256 ;; checksum as well. - (version "20180103") + (version "20180226") (source (origin (method url-fetch) (uri (string-append "https://orgmode.org/elpa/org-" version ".tar")) (sha256 (base32 - "1hyw9sigcv9wn37y2icmhf1czf0s3dgvsmn36355l95zsw7hnvgj")))) + "0jqvry6gah1bwnryha4asynj13jyds3qim0xcy7s01rxk99m2ziy")))) (build-system emacs-build-system) (home-page "https://orgmode.org/") (synopsis "Outline-based notes management and organizer") @@ -4519,7 +4521,7 @@ reproducible research.") (package-version emacs-org) ".tar")) (sha256 (base32 - "164i2asqh34p1g3iqsn7rziyxbi1ys8fwdmn7nsw5xph8qszv9zj")))) + "034wp70hcqnpidji5k1k80mj35iyyy098nbvc2sl7i2aca4m03zc")))) (arguments `(#:modules ((guix build emacs-build-system) (guix build utils) @@ -6785,8 +6787,8 @@ want to use it.") (license license:gpl3+))) (define-public emacs-slack - (let ((commit "02ee1d7339e48c64946041f6f4e09447c3f53e82") - (revision "2")) + (let ((commit "92724604879149cf331fa8778d089813a9d4ce1a") + (revision "3")) (package (name "emacs-slack") (version (string-append "0-" revision "." (string-take commit 7))) @@ -6798,7 +6800,7 @@ want to use it.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0grx95xxf314m2k35m1kf20l2pwc6j11ibvrngx4pis7wqwjas3h")))) + "1fdf8s3ca356k7m7f5kqzfamfl2nrqjj2pynjv3kkrr0ad15nxmw")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-alert" ,emacs-alert) @@ -6889,7 +6891,7 @@ in a generalized CSV (character-separated values) format.") (define-public emacs-transmission (package (name "emacs-transmission") - (version "0.12") + (version "0.12.1") (source (origin (method url-fetch) (uri (string-append @@ -6898,7 +6900,7 @@ in a generalized CSV (character-separated values) format.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1y0bpsy16pycp6m9aqvfjh2x1yswfb305ib7m2slcjpb6njgxfi6")))) + "1rrlgn96gi1ljfwbwvlyyxbq75xzamlbdhq1bpyadxxmxcvlmk3n")))) (build-system emacs-build-system) (home-page "https://github.com/holomorph/transmission") (synopsis "Emacs interface to a Transmission session") @@ -7311,3 +7313,51 @@ Features: (description "@code{epipe} provides an utility to use your editor in the pipeline, featuring the support for running @code{emacsclient}.") (license license:gpl3+))) + +(define-public emacs-hcl-mode + (package + (name "emacs-hcl-mode") + (version "0.03") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/syohex/emacs-hcl-mode/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0pvw74qpwh0znqzp6syp4wxjqs7dp1hbn5h7xfk97mff9l5d8k6x")))) + (build-system emacs-build-system) + (home-page "https://github.com/syohex/emacs-hcl-mode") + (synopsis "Major mode for the Hashicorp Configuration Language") + (description + "@code{emacs-hcl-mode} provides an Emacs major mode for working with +@acronym{HCL, Hashicorp Configuration Language}. It provides syntax +highlighting and indentation support.") + (license license:gpl3+))) + +(define-public emacs-terraform-mode + (package + (name "emacs-terraform-mode") + (version "0.06") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/syohex/emacs-terraform-mode/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0h9267ifdjmcin4sj8slxydbacx4bqicbvg8pa1qq2l72h9m5381")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-hcl-mode" ,emacs-hcl-mode))) + (home-page "https://github.com/syohex/emacs-terraform-mode") + (synopsis "Major mode for Terraform") + (description + "@code{emacs-terraform-mode} provides a major mode for working with +@uref{https://www.terraform.io/, Terraform} configuration files. Most of the +functionality is inherited from @code{hcl-mode}.") + (license license:gpl3+))) |