Merge branch 'master' into staging

7 files changed, 115 insertions, 0 deletions

diff --git a/etc/snippets/yas/scheme-mode/guix-bzr-reference b/etc/snippets/yas/scheme-mode/guix-bzr-reference
new file mode 100644
index 0000000000..a801cc36f2
--- /dev/null
+++ b/etc/snippets/yas/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/yas/scheme-mode/guix-cvs-reference b/etc/snippets/yas/scheme-mode/guix-cvs-reference
new file mode 100644
index 0000000000..fbc5034b66
--- /dev/null
+++ b/etc/snippets/yas/scheme-mode/guix-cvs-reference
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: guix-cvs-reference
+# key: cvs-reference...
+# --
+(cvs-reference
+  (root-directory "${1:root-directory}")
+  (module "${2:module}")
+  (revision "${3:revision}"))
\ No newline at end of file
diff --git a/etc/snippets/yas/scheme-mode/guix-git-reference b/etc/snippets/yas/scheme-mode/guix-git-reference
new file mode 100644
index 0000000000..29ca6a9c54
--- /dev/null
+++ b/etc/snippets/yas/scheme-mode/guix-git-reference
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: guix-git-reference
+# key: git-reference...
+# --
+(git-reference
+  (url "$1")
+  (commit ${2:commit}))
\ No newline at end of file
diff --git a/etc/snippets/yas/scheme-mode/guix-hg-reference b/etc/snippets/yas/scheme-mode/guix-hg-reference
new file mode 100644
index 0000000000..95de16daae
--- /dev/null
+++ b/etc/snippets/yas/scheme-mode/guix-hg-reference
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: guix-hg-reference
+# key: hg-reference...
+# --
+(hg-reference
+  (url "$1")
+  (changeset ${2:changeset}))
\ No newline at end of file
diff --git a/etc/snippets/yas/scheme-mode/guix-origin b/etc/snippets/yas/scheme-mode/guix-origin
new file mode 100644
index 0000000000..eb0cdc8242
--- /dev/null
+++ b/etc/snippets/yas/scheme-mode/guix-origin
@@ -0,0 +1,29 @@
+# -*- mode: snippet -*-
+# name: guix-origin
+# key: origin...
+# --
+(origin
+ (method ${1:$$(yas-choose-value "url-fetch"
+                                 "url-fetch/tarbomb"
+                                 "url-fetch/zipbomb"
+                                 "cvs-fetch"
+                                 "git-fetch"
+                                 "hg-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))")
+            ((equal yas-text "hg-fetch")
+             "(file-name (hg-file-name name version))")
+            ((member yas-text '("svn-fetch" "cvs-fetch" "bzr-fetch"))
+             "(file-name (string-append name \\"-\\" version \\"-checkout\\"))")
+            (t ""))}
+ (sha256
+  (base32
+    "$2")))
\ No newline at end of file
diff --git a/etc/snippets/yas/scheme-mode/guix-package b/etc/snippets/yas/scheme-mode/guix-package
new file mode 100644
index 0000000000..724a392f81
--- /dev/null
+++ b/etc/snippets/yas/scheme-mode/guix-package
@@ -0,0 +1,50 @@
+# -*- mode: snippet -*-
+# name: guix-package
+# key: package...
+# --
+(define-public $1
+  (package
+    (name "$1")
+    (version "$2")
+    (source origin...$0)
+    (build-system ${3:$$(yas-choose-value "android-ndk-build-system"
+                                          "ant-build-system"
+                                          "asdf-build-system"
+                                          "cargo-build-system"
+                                          "chicken-build-system"
+                                          "clojure-build-system"
+                                          "cmake-build-system"
+                                          "copy-build-system"
+                                          "dub-build-system"
+                                          "dune-build-system"
+                                          "emacs-build-system"
+                                          "font-build-system"
+                                          "glib-or-gtk-build-system"
+                                          "gnu-build-system"
+                                          "go-build-system"
+                                          "guile-build-system"
+                                          "haskell-build-system"
+                                          "julia-build-system"
+                                          "linux-module-build-system"
+                                          "maven-build-system"
+                                          "meson-build-system"
+                                          "minetest-build-system"
+                                          "minify-build-system"
+                                          "node-build-system"
+                                          "ocaml-build-system"
+                                          "perl-build-system"
+                                          "python-build-system"
+                                          "qt-build-system"
+                                          "r-build-system"
+                                          "rakudo-build-system"
+                                          "rebar-build-system"
+                                          "renpy-build-system"
+                                          "ruby-build-system"
+                                          "scons-build-system"
+                                          "texlive-build-system"
+                                          "trivial-build-system"
+                                          "waf-build-system")})
+    (home-page "$4")
+    (synopsis "$5")
+    (description "$6")
+    (license $7)))
\ No newline at end of file
diff --git a/etc/snippets/yas/scheme-mode/guix-svn-reference b/etc/snippets/yas/scheme-mode/guix-svn-reference
new file mode 100644
index 0000000000..7d897dc690
--- /dev/null
+++ b/etc/snippets/yas/scheme-mode/guix-svn-reference
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: guix-svn-reference
+# key: svn-reference...
+# --
+(svn-reference
+  (url "$1")
+  (revision ${2:svn-revision}))
\ No newline at end of file