diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
| commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
| tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /etc/snippets | |
| parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
| parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
Merge branch 'staging' into 'core-updates'.
Conflicts:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/guile.scm
gnu/packages/node.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/python-xyz.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/vpn.scm
gnu/packages/xorg.scm
Diffstat (limited to 'etc/snippets')
| -rw-r--r-- | etc/snippets/scheme-mode/guix-package | 10 | ||||
| -rw-r--r-- | etc/snippets/text-mode/guix-commit-message-add-package | 6 | ||||
| -rw-r--r-- | etc/snippets/text-mode/guix-commit-message-update-package | 8 |
3 files changed, 17 insertions, 7 deletions
diff --git a/etc/snippets/scheme-mode/guix-package b/etc/snippets/scheme-mode/guix-package index 48b87e3599..9ff6f997d1 100644 --- a/etc/snippets/scheme-mode/guix-package +++ b/etc/snippets/scheme-mode/guix-package @@ -11,20 +11,30 @@ "ant-build-system" "asdf-build-system" "cargo-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" "minify-build-system" + "node-build-system" "ocaml-build-system" "perl-build-system" "python-build-system" + "qt-build-system" "r-build-system" + "rakudo-build-system" "ruby-build-system" "scons-build-system" "texlive-build-system" diff --git a/etc/snippets/text-mode/guix-commit-message-add-package b/etc/snippets/text-mode/guix-commit-message-add-package index e54a06de7e..7cebd4023a 100644 --- a/etc/snippets/text-mode/guix-commit-message-add-package +++ b/etc/snippets/text-mode/guix-commit-message-add-package @@ -6,8 +6,8 @@ gnu: Add ${1:`(with-temp-buffer (magit-git-wash #'magit-diff-wash-diffs "diff" "--staged") - (beginning-of-buffer) - (when (search-forward "+(define-public " nil 'noerror) - (thing-at-point 'sexp 'no-properties)))`}. + (goto-char (point-min)) + (when (re-search-forward "\\+(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1)))`}. * `(car (magit-staged-files))` ($1): New variable.
\ No newline at end of file diff --git a/etc/snippets/text-mode/guix-commit-message-update-package b/etc/snippets/text-mode/guix-commit-message-update-package index 2cdb6ea28d..f187419aa2 100644 --- a/etc/snippets/text-mode/guix-commit-message-update-package +++ b/etc/snippets/text-mode/guix-commit-message-update-package @@ -7,12 +7,12 @@ gnu: ${1:`(with-temp-buffer (magit-git-wash #'magit-diff-wash-diffs "diff" "--staged") - (beginning-of-buffer) - (when (search-forward "(define-public " nil 'noerror) - (thing-at-point 'sexp 'no-properties)))`}: Update to ${2:`(with-temp-buffer + (goto-char (point-min)) + (when (re-search-forward "(define-public \\(\\S-+\\)" nil 'noerror) + (match-string-no-properties 1)))`}: Update to ${2:`(with-temp-buffer (magit-git-wash #'magit-diff-wash-diffs "diff" "--staged") - (beginning-of-buffer) + (goto-char (point-min)) (search-forward "name" nil 'noerror) (search-forward "+" nil 'noerror) ; first change (when (and (search-forward "version " nil 'noerror) |