aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2018-11-20 23:11:29 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2019-05-09 00:22:37 -0400
commit4ac69ea10f54384ac893313ef738e5ad554ac328 (patch)
treedcbe1033a84ac70b0422b42cb4ef6ba1d4aa4120 /etc
parentc526b3176fb85175ea0d3a5b561927a23522263b (diff)
downloadguix-4ac69ea10f54384ac893313ef738e5ad554ac328.tar.gz
guix-4ac69ea10f54384ac893313ef738e5ad554ac328.zip
Add (guix bzr-download).
* guix/bzr-download.scm, guix/build/bzr.scm, etc/snippets/scheme-mode/guix-bzr-reference: New files. * Makefile.am (MODULES): Add them. * etc/snippets/scheme-mode/guix-origin: Add "bzr-fetch" to the origin choices.
Diffstat (limited to 'etc')
-rw-r--r--etc/snippets/scheme-mode/guix-bzr-reference7
-rw-r--r--etc/snippets/scheme-mode/guix-origin6
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