diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-05-24 22:44:51 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-05-24 22:44:51 +0200 |
| commit | ddb4062784c66ecc0c42910b209dc80356a197ea (patch) | |
| tree | d61154cfe888201707c2b4708bd6297ac371f0b0 /etc/snippets | |
| parent | 563ecba5cf1dac64818fa7c452fcb191ec28e0fd (diff) | |
| parent | dbe533292b2af2faad371c10bc9b3f03193f94b7 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'etc/snippets')
| -rw-r--r-- | etc/snippets/scheme-mode/guix-bzr-reference | 7 | ||||
| -rw-r--r-- | etc/snippets/scheme-mode/guix-origin | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/etc/snippets/scheme-mode/guix-bzr-reference b/etc/snippets/scheme-mode/guix-bzr-reference new file mode 100644 index 0000000000..a801cc36f2 --- /dev/null +++ b/etc/snippets/scheme-mode/guix-bzr-reference @@ -0,0 +1,7 @@ +# -*- mode: snippet -*- +# name: guix-bzr-reference +# key: bzr-reference... +# -- +(bzr-reference + (url "$1") + (revision ${2:ref}))
\ No newline at end of file diff --git a/etc/snippets/scheme-mode/guix-origin b/etc/snippets/scheme-mode/guix-origin index 1a068f8859..2820a369f3 100644 --- a/etc/snippets/scheme-mode/guix-origin +++ b/etc/snippets/scheme-mode/guix-origin @@ -9,15 +9,17 @@ "cvs-fetch" "git-fetch" "hg-fetch" - "svn-fetch")}) + "svn-fetch" + "bzr-fetch")}) (uri ${1:$(cond ((equal yas-text "git-fetch") "git-reference...") ((equal yas-text "svn-fetch") "svn-reference...") ((equal yas-text "hg-fetch") "hg-reference...") ((equal yas-text "cvs-fetch") "cvs-reference...") + ((equal yas-text "bzr-fetch") "bzr-reference...") (t "(string-append \\"https://\\" version \\".tar.gz\\")"))}$0) ${1:$(cond ((equal yas-text "git-fetch") "(file-name (git-file-name name version))") - ((member yas-text '("svn-fetch" "hg-fetch" "cvs-fetch")) + ((member yas-text '("svn-fetch" "hg-fetch" "cvs-fetch" "bzr-fetch")) "(file-name (string-append name \\"-\\" version \\"-checkout\\"))") (t ""))} (sha256 |