Skip to content

Commit 33b491a

Browse files
committed
Merge remote-tracking branch 'upstream/master' into track-upstream
* upstream/master: Add `kubed` recipe (dimitri#2958) Move some packages from `git` to `github` type (dimitri#2957) Update howm.rcp (dimitri#2956) Add recipes for ellama and its dependencies: llm and plz (dimitri#2955) Update recipe for magit: generate only info docs (dimitri#2954) Switch location for `adoc-mode` (dimitri#2953) Update location for `scratch` recipe (dimitri#2952) Change URL for profile-dotemacs recipe (dimitri#2951) Fixed Mastodon recipe (dimitri#2950) Add a recipe for helm-sx (dimitri#2949)
2 parents c4da029 + 847901f commit 33b491a

25 files changed

+81
-40
lines changed

recipes/ac-R.rcp

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
(:name ac-R
22
:description "Auto-completion-mode support for R"
3-
:type git
4-
:url "https://github.com/mlf176f2/ac-R")
3+
:type github
4+
:pkgname "mlf176f2/ac-R"
5+
:depends (ess)
6+
)

recipes/adoc-mode.rcp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(:name adoc-mode
2-
:website "https://github.com/sensorflo/adoc-mode/wiki"
2+
:website "https://github.com/bbatsov/adoc-mode/wiki"
33
:description "A major-mode for editing AsciiDoc files in Emacs."
44
:type github
5-
:pkgname "sensorflo/adoc-mode"
5+
:pkgname "bbatsov/adoc-mode"
66
:depends markup-faces)

recipes/durendal.rcp

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
(:name durendal
22
:website "https://github.com/technomancy/durendal"
33
:description "A bucket of Emacs tricks for Clojure."
4-
:type git :url "https://github.com/technomancy/durendal.git")
4+
:type github
5+
:pkgname "technomancy/durendal"
6+
)

recipes/ellama.rcp

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
(:name ellama
2+
:description "Tool for interacting with LLMs"
3+
:minimum-emacs-version "28.1"
4+
:type github
5+
:pkgname "s-kostyaev/ellama"
6+
:depends (llm spinner compat))

recipes/flymake-html-validator.rcp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(:name "flymake-html-validator"
22
:description "Make flymake work with Validator.nu."
3-
:type git
4-
:url "https://github.com/dwdreisigmeyer/flymake-html-validator"
3+
:type github
4+
:pkgname "dwdreisigmeyer/flymake-html-validator"
55
:features "flymake-html-validator"
66
:prepare (setq validator-script (concat el-get-dir "flymake-html-validator")))

recipes/helm-sx.rcp

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
(:name helm-sx
2+
:description "Helm interface for sx.el - Stack Exchange client"
3+
:type github
4+
:pkgname "813gan/helm-sx.el"
5+
:depends (sx helm))
+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
(:name highlight-indentation-guides
22
:description "This minor mode highlights indentation levels via font-lock"
3-
:type git
4-
:url "https://github.com/DarthFennec/highlight-indent-guides.git")
3+
:type github
4+
:pkgname "DarthFennec/highlight-indent-guides"
5+
)

recipes/highlight-indentation.rcp

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
(:name highlight-indentation
22
:description "Function for highlighting indentation"
3-
:type git
4-
:url "https://github.com/antonj/Highlight-Indentation-for-Emacs")
3+
:type github
4+
:pkgname "antonj/Highlight-Indentation-for-Emacs"
5+
)

recipes/hl-tags-mode.rcp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(:name hl-tags-mode
22
:website "http://www.reddit.com/r/emacs/comments/ha7l9/html_matching_tag_highlighting/"
33
:description "if the cursor is inside of a '<div ....>' tag, it will highlight it and the corresponding '</div>' tag"
4-
:type git
5-
:url "https://github.com/deactivated/hl-tags-mode"
4+
:type github
5+
:pkgname "deactivated/hl-tags-mode"
66
:features hl-tags-mode)

recipes/howm.rcp

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
(:name howm
2-
:website "http://howm.sourceforge.jp/"
2+
:website "https://kaorahi.github.io/howm/"
33
:description "Write fragmentarily and read collectively."
4-
:type http-tar
5-
:options ("xzf")
6-
:url "http://howm.sourceforge.jp/a/howm-1.4.4.tar.gz"
4+
:type github
5+
:pkgname "kaorahi/howm"
76
:build `(("./configure" ,(concat "--with-emacs=" el-get-emacs)) ("make")))

recipes/ioccur.rcp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(:name ioccur
22
:description "Incremental occur."
3-
:type git
4-
:url "https://github.com/thierryvolpiatto/ioccur"
3+
:type github
4+
:pkgname "thierryvolpiatto/ioccur"
55
:features ioccur)

recipes/kubed.rcp

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
(:name kubed
2+
:description "A python refactoring library"
3+
:type github
4+
:pkgname "eshelyaron/kubed"
5+
:minimum-emacs-version "29.1"
6+
:website "https://eshelyaron.com/kubed.html"
7+
)

recipes/llm.rcp

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
(:name llm
2+
:description "Interface to pluggable llm backends"
3+
:minimum-emacs-version "28.1"
4+
:type github
5+
:pkgname "ahyatt/llm"
6+
:depends (plz))

recipes/magit.rcp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
;; handle compilation and autoloads on its own. Create an
1616
;; empty autoloads file because magit.el explicitly checks for
1717
;; a file of that name.
18-
:build `(("make" ,(format "EMACSBIN=%s" el-get-emacs) "docs")
18+
:build `(("make" ,(format "EMACSBIN=%s" el-get-emacs) "info")
1919
("touch" "lisp/magit-autoloads.el"))
2020
:build/berkeley-unix `(("gmake" ,(format "EMACSBIN=%s" el-get-emacs) "docs")
2121
("touch" "lisp/magit-autoloads.el"))

recipes/mastodon.rcp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(:name mastodon
2-
:website "https://github.com/jdenen/mastodon.el"
2+
:website "https://codeberg.org/martianh/mastodon.el"
33
:description "Emacs client for Mastodon"
4-
:type github
5-
:pkgname "jdenen/mastodon.el"
4+
:type git
5+
:url "https://codeberg.org/martianh/mastodon.el.git"
66
:load-path ("./lisp"))

recipes/mew.rcp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(:name mew
22
:description "Mew is a mail reader for Emacs"
3-
:type git
4-
:url "https://github.com/kazu-yamamoto/Mew.git"
3+
:type github
4+
:pkgname "kazu-yamamoto/Mew"
55
;;; To use Mew S/MIME support, manual configuration of
66
;;; pinentry-program entry on ~/.gnupg/gpg-agent.conf is required.
77
;;; pinentry-program for mew is (concat el-get-dir "mew/bin/mew-pinentry")

recipes/plz.rcp

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
(:name plz
2+
:description "An HTTP library that uses curl as a backend"
3+
:minimum-emacs-version "27.1"
4+
:type github
5+
:pkgname "alphapapa/plz.el"
6+
:depends ())

recipes/pony-mode.rcp

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
(:name pony-mode
22
:website "https://github.com/davidmiller/pony-mode"
33
:description "A Django mode for Emacs."
4-
:type git
4+
:type github
5+
:pkgname "davidmiller/pony-mode"
56
:load-path "src"
6-
:url "https://github.com/davidmiller/pony-mode")
7+
)

recipes/profile-dotemacs.rcp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
(:name profile-dotemacs
2-
:type http
3-
:url "http://www.randomsample.de/profile-dotemacs.el"
2+
:type github
3+
:pkgname "raxod502/profile-dotemacs"
44
:description "profiles your .emacs")

recipes/rope.rcp

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
:post-init
44
;; Add to PYTHONPATH directly as it is used in ropemacs and traad
55
(el-get-envpath-prepend "PYTHONPATH" default-directory)
6-
:type git
7-
:url "https://github.com/python-rope/rope.git")
6+
:type github
7+
:pkgname "python-rope/rope"
8+
)

recipes/ropemacs.rcp

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
(unless (boundp 'pymacs-load-path) (setq pymacs-load-path nil))
66
(add-to-list 'pymacs-load-path default-directory))
77
:depends (rope ropemode pymacs)
8-
:type git
9-
:url "https://github.com/python-rope/ropemacs")
8+
:type github
9+
:pkgname "python-rope/ropemacs"
10+
)

recipes/ropemode.rcp

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
(progn
55
(unless (boundp 'pymacs-load-path) (setq pymacs-load-path nil))
66
(add-to-list 'pymacs-load-path default-directory))
7-
:type git
8-
:url "https://github.com/python-rope/ropemode")
7+
:type github
8+
:pkgname "python-rope/ropemode"
9+
)

recipes/scpaste.rcp

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
(:name scpaste
22
:website "http://www.emacswiki.org/cgi-bin/wiki/SCPaste"
33
:description "Paste to the web via scp."
4-
:type git
5-
:url "https://github.com/technomancy/scpaste.git")
4+
:type github
5+
:pkgname "technomancy/scpaste"
6+
)

recipes/scratch.rcp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(:name scratch
22
:description "Mode-specific scratch buffers"
3-
:type github
4-
:pkgname "cbbrowne/scratch-el"
3+
:type git
4+
:url "https://codeberg.org/emacs-weirdware/scratch"
55
:info "."
66
:build (("make"))
77
:load-path ".")

recipes/shadow.rcp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
(:name shadow
22
:description "That's not the file. That's shadow."
3-
:type git :url "https://github.com/mooz/shadow.el.git"
3+
:type github
4+
:pkgname "mooz/shadow.el"
45
:features shadow
56
:post-init (progn
67
(add-hook 'find-file-hooks 'shadow-on-find-file)

0 commit comments

Comments
 (0)