From 7bdcbaab4f4125c47778c7afc36ac468adbe6c4e Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 16 Mar 2019 08:58:29 -0400 Subject: [PATCH 1/1] [emacs] update packages MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit also remove the Org hack, as it’s now built into straight.el and enabled by default --- init.org | 35 ----------------------------------- straight/versions/default.el | 35 +++++++++++++++++------------------ 2 files changed, 17 insertions(+), 53 deletions(-) diff --git a/init.org b/init.org index fd734b1..422af4c 100644 --- a/init.org +++ b/init.org @@ -873,41 +873,6 @@ system. In short, my favourite way of life. -First, we have to resort to a [[https://github.com/raxod502/straight.el#installing-org-with-straightel][hack]] to be able to use the correct -latest version of Org from upstream. - -#+begin_src emacs-lisp - (use-package git) - - (defun org-git-version () - "The Git version of org-mode. - Inserted by installing org-mode or when a release is made." - (require 'git) - (let ((git-repo (expand-file-name - "straight/repos/org/" user-emacs-directory))) - (string-trim - (git-run "describe" - "--match=release\*" - "--abbrev=6" - "HEAD")))) - - (defun org-release () - "The release version of org-mode. - Inserted by installing org-mode or when a release is made." - (require 'git) - (let ((git-repo (expand-file-name - "straight/repos/org/" user-emacs-directory))) - (string-trim - (string-remove-prefix - "release_" - (git-run "describe" - "--match=release\*" - "--abbrev=0" - "HEAD"))))) - -(provide 'org-version) -#+end_src - We will use the =org-plus-contrib= package to get the whole deal: #+begin_src emacs-lisp diff --git a/straight/versions/default.el b/straight/versions/default.el index b187672..ba20957 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -1,5 +1,5 @@ (("PG" . "8f90ac961c22099a615c03ed07576aaef820e06d") - ("all-the-icons.el" . "67241446887b22d6aaf1d93a4e613d41dbd10e1b") + ("all-the-icons.el" . "f41579010537f555a13dd210986e85d5746dfaba") ("alloy-mode" . "0d05bdd10c77ec04c3d61eccf67e68c08284951f") ("auto-compile" . "e6bbb1371324c8884af3b201e9adbc9296eb2ff4") ("boxquote.el" . "7e47e0e2853bc1215739b2e28f260e9eed93b2c5") @@ -7,23 +7,23 @@ ("cl-lib" . "deb92588d9d83d46c4698936ea31c5f58d244f04") ("closql" . "012b94f8695e194455111fd54eff0b94dd0dd0db") ("company-ebdb" . "3b463fe1236ac6445657f3a1df20357a7a2fa8f6") - ("company-mode" . "20fe01542bf7665ba90f9fe1a86cbe0eea4d9f8a") + ("company-mode" . "f965786c589f95a00901028e49f1eae415053f08") ("crux" . "308f17d914e2cd79cbc809de66d02b03ceb82859") ("dante" . "8e2c3f5d6ff35e20d4f1b478ae06883526c72476") ("dash.el" . "f1ffdf7beb8b4fc6aa156873162c98f84b9465bd") ("diff-hl" . "84a5fe1900af2e5cc522f02749804f0d9f094bbf") - ("ebdb" . "03594c73081c1cd8f17b3e5c80791c2b8b6f60a8") + ("ebdb" . "ae7dd977bd14e358ddd7b4afaf750a372d19f043") ("edit-indirect" . "de645d8144e8a08f039a9c88185121ec81d957ef") ("elisp-refs" . "a8900dab9f8e2925ce5dea0f97bdac4ce47714d9") ("emacs-async" . "81dc034572e963550c5403a2b3c28047e46b4029") - ("emacs-doom-themes" . "c428657a78477772ad0ef1c12dd0d3c90331f434") + ("emacs-doom-themes" . "cbac92578aba8eff8edd18b3e1ea72c295e3631e") ("emacs-eclim" . "23f5b294f833ce58516d7b9ae08a7792d70022a1") ("emacs-memoize" . "9a561268ffb550b257a08710489a95cd087998b6") - ("emacs-which-key" . "c87b0ce78213f922a725be1e0ae2dede1cf29516") - ("emacsql" . "49348329df7abfa9ec8a2d5fea9d90db9df5ed2c") + ("emacs-which-key" . "187ac0eb8990b62d4bfd83aac10a0ae68cdd2ff5") + ("emacsql" . "5ebd12b6ffaa9fbadefe8518eab07a028bbaf7c1") ("emmet-mode" . "1acb821e0142136344ccf40c1e5fb664d7db2e70") - ("epkg" . "f7b624a08bb7d1015401c5e4e582075e61812e6f") - ("epkgs" . "4deec8c8e605f85ee862302345e680bce6dde756") + ("epkg" . "408d46a9d041b516e9fda0414058a287dfef37fb") + ("epkgs" . "7e303629d071d84ae7bbfa71907b1d33e5fbb553") ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6") ("eshell-up" . "9c100bae5c3020e8d9307e4332d3b64e7dc28519") ("exec-path-from-shell" . "76cd6e3fa8a7dac937af7e40507843dfae4f9184") @@ -31,31 +31,30 @@ ("f.el" . "8191672377816a1975414cc1f116fd3b94b30bd0") ("flycheck" . "15705f2c0327a4ff9f71e04bcede7f78a6c089f8") ("flycheck-haskell" . "32ddff87165a7d3a35e7318bee997b5b4bd41278") - ("forge" . "9a18846167bcd1b66c8449772987884ad72cfe2d") + ("forge" . "f82d22a942951538196e7ab645199ef5ad35051e") ("geiser" . "156970ff1402512b4bbf53a5e1c22156cb0e2f9c") - ("ghub" . "e668aa8a23ac728714eadc445b506f43c936be98") - ("git.el" . "a3396a7027a7d986598c6a2d6d5599bac918f3da") + ("ghub" . "901703365f0d4758a741ef834a7d24382d403822") ("gnu-elpa-mirror" . "44a241d6785258829cf9a283af30ef4f5a3e5a6c") ("graphql.el" . "e2b309689f4faf9225f290080f836e988c5a576d") ("guix.el" . "f764641396fb2e8ca1fb319f782b0e07c0a3fd0c") ("haskell-mode" . "4aa88752ab23bca3ded36a9c9fd9c34cffbb129b") - ("helpful" . "a102f46361a41798d8f7ef429f244bb7a81a5868") + ("helpful" . "d155add4af76df4b342250dec7ced57f58400465") ("hl-todo" . "243dfd9c7a8ff6bab5cde9a230d0af9c4ea064f6") ("hlint-refactor-mode" . "c4307f86aad6d02e32e9b30cb6edc115584c791c") ("lcr" . "c14f40692292d59156c7632dbdd2867c086aa75f") ("lean-mode" . "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499") ("let-alist" . "33e71829e8814cf5f28b6e4291192aafef61b69e") ("loop.el" . "e22807f83a0890dc8a904c51ee0742c34efccc6c") - ("magit" . "d1b384650e4358622c0ec4aa35b927fa57d2239d") + ("magit" . "a315f6dbe3ee538d9f46b1be09cb0e700d90ef38") ("magit-popup" . "4250c3a606011e3ff2477e3b5bbde2b493f3c85c") ("markdown-mode" . "115f77df9755c6a453f3e5d9623ff885d207ea82") - ("melpa" . "57c307eecfc0fccfdc525ce6ff63a69ff3b78874") + ("melpa" . "4a34e0ab66491540dd0c5b62c7f60684056b16d5") ("message-x" . "5524de7bbfdd8749c110f48de5afb024d9f83133") ("multi-term" . "f954e4e18b0a035151d34852387e724d87a3316f") ("multiple-cursors.el" . "5ff2071face6d618bbe49bb9e1749da9daf4ac85") ("mwim.el" . "b4f3edb4c0fb8f8b71cecbf8095c2c25a8ffbf85") ("no-littering" . "19bf47f33915d554bf5e3769202b646a2a78d7d3") - ("org" . "300f15bcbbaf7a49c94e2cfca4f4335f0dc55fc8") + ("org" . "0a8de94b13806216a01ceb8786ac88486f3394a5") ("orgalist" . "f70a65da3a9bf3d0c1a9c769b77821d2a79c42cb") ("ox-hugo" . "57f0c8c91df56f0b81b0e0cd6e28b4a25b71e2a2") ("packed" . "c41c3dfda86ae33832ffc146923e2a4675cbacfa") @@ -70,13 +69,13 @@ ("shut-up" . "081d6b01e3ba0e60326558e545c4019219e046ce") ("smart-mode-line" . "b79f4fa5f2380b0d726a895dd7199e5483004490") ("smex" . "55aaebe3d793c2c990b39a302eb26c184281c42c") - ("straight.el" . "6535b5fffeb6acf922b9baa7d41980ee5f4a153d") - ("swiper" . "a538df11747e98ec2af0635558d04082211a15bf") + ("straight.el" . "4d2c3ab92c83a6d2a45ba8ef391dd01d555178fc") + ("swiper" . "3954bfed72908998a472e5c8ebe8c0739f89a3f9") ("transient" . "a6295fa7eea2d7a95c705684064e82ea47e27e44") ("treepy.el" . "b40e6b09eb9be45da67b8c9e4990a5a0d7a2a09d") ("typoel" . "9dad93b6f367f02f52c8d9bf15d446d922cec294") ("unkillable-scratch" . "b24c2a760529833f230c14cb02ff6e7ec92288ab") - ("use-package" . "59547d9e2a9e2f0a5e21134a0735fffff5371838") + ("use-package" . "19b6a562dc93fbf186e7ac04a335ab3d1822c475") ("web-mode" . "c8a3b33e088d2a910c000804966b804bba33f982") ("with-editor" . "38df9bfc2227bcb7ac4899c83a03756d5f171450") ("yasnippet" . "1d96da2e08664c31ff7f6f7441da1f4fa5680b1f") -- 2.20.1