[bug#32059] Improve etc/snippets

[bug#32059] Improve etc/snippets

[Arun Isaac]

Patch 1 adds the android-ndk and scons build systems as possibilities for the
build-system field in the package snippet.

Patch 2 modifies the package snippet so that 'origin' comes on the next line
after 'source'. I feel this is better because it makes better use of space
(less whitespace on the left of the source description). Often, this is
necessary to not run afoul of the line length limitations of `guix lint`.

Patch 3 adds a guix commit message snippet for changing the home page of
packages to HTTPS.

Patch 1 is uncontroversial. But, I don't know if others would agree on patches
2 and 3. Anyways, I am just submitting them here for consideration.

Arun Isaac (3):
  etc: snippets: Add new build systems to package snippet.
  etc: snippets: Improve indentation in the package snippet.
  etc: snippets: Add guix-commit-message-use-https-home-page.

 doc/contributing.texi                                          | 3 ++-
 etc/snippets/scheme-mode/guix-package                          | 7 +++++--
 etc/snippets/text-mode/guix-commit-message-use-https-home-page | 9 +++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 etc/snippets/text-mode/guix-commit-message-use-https-home-page

-- 
2.15.1

[bug#32059] [PATCH 1/3] etc: snippets: Add new build systems to package snippet.

[Arun Isaac]

* etc/snippets/scheme-mode/guix-package: Add android-ndk-build-system and
scons-build-system as possibilities for the build-system field.
---
 etc/snippets/scheme-mode/guix-package | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/snippets/scheme-mode/guix-package b/etc/snippets/scheme-mode/guix-package
index d392e8209..48b87e359 100644
--- a/etc/snippets/scheme-mode/guix-package
+++ b/etc/snippets/scheme-mode/guix-package
@@ -7,7 +7,8 @@
     (name "$1")
     (version "$2")
     (source origin...$0)
-    (build-system ${3:$$(yas-choose-value "ant-build-system"
+    (build-system ${3:$$(yas-choose-value "android-ndk-build-system"
+                                          "ant-build-system"
                                           "asdf-build-system"
                                           "cargo-build-system"
                                           "cmake-build-system"
@@ -25,6 +26,7 @@
                                           "python-build-system"
                                           "r-build-system"
                                           "ruby-build-system"
+                                          "scons-build-system"
                                           "texlive-build-system"
                                           "trivial-build-system"
                                           "waf-build-system")})
-- 
2.15.1

[bug#32059] [PATCH 2/3] etc: snippets: Improve indentation in the package snippet.

[Arun Isaac]

* etc/snippets/scheme-mode/guix-package: Move origin field to the next line.
---
 etc/snippets/scheme-mode/guix-package | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/snippets/scheme-mode/guix-package b/etc/snippets/scheme-mode/guix-package
index 48b87e359..18735bd18 100644
--- a/etc/snippets/scheme-mode/guix-package
+++ b/etc/snippets/scheme-mode/guix-package
@@ -6,7 +6,8 @@
   (package
     (name "$1")
     (version "$2")
-    (source origin...$0)
+    (source
+     origin...$0)
     (build-system ${3:$$(yas-choose-value "android-ndk-build-system"
                                           "ant-build-system"
                                           "asdf-build-system"
-- 
2.15.1

[bug#32059] [PATCH 3/3] etc: snippets: Add guix-commit-message-use-https-home-page.

[Arun Isaac]

* etc/snippets/text-mode/guix-commit-message-use-https-home-page: New file.
* doc/contributing.texi (The Perfect Setup): Document new snippet.
---
 doc/contributing.texi                                          | 3 ++-
 etc/snippets/text-mode/guix-commit-message-use-https-home-page | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 etc/snippets/text-mode/guix-commit-message-use-https-home-page

diff --git a/doc/contributing.texi b/doc/contributing.texi
index ca44b3b0b..79bd536f5 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -210,7 +210,8 @@ The commit message snippets depend on @url{https://magit.vc/, Magit} to
 display staged files.  When editing a commit message type @code{add}
 followed by @kbd{TAB} to insert a commit message template for adding a
 package; type @code{update} followed by @kbd{TAB} to insert a template
-for updating a package.
+for updating a package; type @code{https} followed by @kbd{TAB} to
+insert a template for changing the home page URI of a package to HTTPS.
 
 The main snippet for @code{scheme-mode} is triggered by typing
 @code{package...} followed by @kbd{TAB}.  This snippet also inserts the
diff --git a/etc/snippets/text-mode/guix-commit-message-use-https-home-page b/etc/snippets/text-mode/guix-commit-message-use-https-home-page
new file mode 100644
index 000000000..df20d31a8
--- /dev/null
+++ b/etc/snippets/text-mode/guix-commit-message-use-https-home-page
@@ -0,0 +1,9 @@
+# -*- mode: snippet -*-
+# name: guix-commit-message-use-https-home-page
+# key: https
+# condition: git-commit-mode
+# --
+gnu: $1: Use HTTPS home page URI.
+
+* `(car (magit-staged-files))` ($1)[home-page]: Use HTTPS URI.
+`(mapconcat (lambda (file) (concat "* " file)) (cdr (magit-staged-files)) "\n")`
\ No newline at end of file
-- 
2.15.1

[bug#32059] [PATCH 1/3] etc: snippets: Add new build systems to package snippet.

[Ludovic Courtès]

Arun Isaac <arunisaac@systemreboot.net> skribis:

> * etc/snippets/scheme-mode/guix-package: Add android-ndk-build-system and
> scons-build-system as possibilities for the build-system field.

LGTM!

[bug#32059] [PATCH 2/3] etc: snippets: Improve indentation in the package snippet.

[Ludovic Courtès]

Arun Isaac <arunisaac@systemreboot.net> skribis:

> * etc/snippets/scheme-mode/guix-package: Move origin field to the next line.
> ---
>  etc/snippets/scheme-mode/guix-package | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/etc/snippets/scheme-mode/guix-package b/etc/snippets/scheme-mode/guix-package
> index 48b87e359..18735bd18 100644
> --- a/etc/snippets/scheme-mode/guix-package
> +++ b/etc/snippets/scheme-mode/guix-package
> @@ -6,7 +6,8 @@
>    (package
>      (name "$1")
>      (version "$2")
> -    (source origin...$0)
> +    (source
> +     origin...$0)

I personally prefer the original version.  :-)

[bug#32059] [PATCH 3/3] etc: snippets: Add guix-commit-message-use-https-home-page.

[Ludovic Courtès]

Arun Isaac <arunisaac@systemreboot.net> skribis:

> * etc/snippets/text-mode/guix-commit-message-use-https-home-page: New file.
> * doc/contributing.texi (The Perfect Setup): Document new snippet.

LGTM, thanks!

bug#32059: [PATCH 2/3] etc: snippets: Improve indentation in the package snippet.

[Arun Isaac]

>> -    (source origin...$0)
>> +    (source
>> +     origin...$0)
>
> I personally prefer the original version.  :-)

Oh, well... :-( But, I understand... :-)

I have pushed the other two patches to master.

[bug#32059] [PATCH 2/3] etc: snippets: Improve indentation in the package snippet.

[Ludovic Courtès]

Arun Isaac <arunisaac@systemreboot.net> skribis:

>>> -    (source origin...$0)
>>> +    (source
>>> +     origin...$0)
>>
>> I personally prefer the original version.  :-)
>
> Oh, well... :-( But, I understand... :-)
>
> I have pushed the other two patches to master.

Heheh, thank you!

Ludo’.