diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /etc/snippets | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
Diffstat (limited to 'etc/snippets')
| -rw-r--r-- | etc/snippets/tempel/scheme-mode | 8 | ||||
| -rw-r--r-- | etc/snippets/yas/scheme-mode/guix-news-entry | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/etc/snippets/tempel/scheme-mode b/etc/snippets/tempel/scheme-mode index 54cb8e40a9..ef73a1e595 100644 --- a/etc/snippets/tempel/scheme-mode +++ b/etc/snippets/tempel/scheme-mode @@ -56,12 +56,12 @@ scheme-mode (git-reference... "(git-reference" n> "(url \"" p "\")" - n> "(commit \"" p "\"))") + n> "(commit " (p "commit") "))") (svn-reference... "(svn-reference" n> "(url \"" p "\")" - n> "(revision \"" p "\"))") + n> "(revision " (p "revision") "))") (cvs-reference... "(cvs-reference" @@ -72,12 +72,12 @@ scheme-mode (hg-reference... "(hg-reference" n> "(url \"" p "\")" - n> "(changeset \"" p "\"))") + n> "(changeset " (p "changeset") "))") (bzr-reference... "(bzr-reference" n> "(url \"" p "\")" - n> "(revision \"" p "\"))") + n> "(revision " (p "revision") "))") (:phases\ "#:phases (modify-phases %standard-phases" n> p ")") diff --git a/etc/snippets/yas/scheme-mode/guix-news-entry b/etc/snippets/yas/scheme-mode/guix-news-entry new file mode 100644 index 0000000000..7f5bb21c50 --- /dev/null +++ b/etc/snippets/yas/scheme-mode/guix-news-entry @@ -0,0 +1,9 @@ +# -*- mode: snippet -*- +# name: guix-news-entry +# key: entry... +# -- +(entry (commit "$1") + (title + (en "$2")) + (body + (en "$3"))) |