--- Begin Message ---
|
Subject: |
[PATCH] gnu: emacs-browse-at-remote: Update to 0.10.0. |
|
Date: |
Sat, 30 Jun 2018 22:38:53 +0300 |
* gnu/packages/emacs.scm (emacs-browse-at-remote): Update to 0.10.0.
* gnu/packages/patches/emacs-browse-at-remote-cgit-gnu.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
gnu/packages/emacs.scm | 58 +++++++++---------
.../emacs-browse-at-remote-cgit-gnu.patch | 59 -------------------
3 files changed, 27 insertions(+), 91 deletions(-)
delete mode 100644 gnu/packages/patches/emacs-browse-at-remote-cgit-gnu.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 58aebf12a..565172b28 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -649,7 +649,6 @@ dist_patch_DATA =
\
%D%/packages/patches/elfutils-tests-ptrace.patch \
%D%/packages/patches/elogind-glibc-2.27.patch \
%D%/packages/patches/einstein-build.patch \
- %D%/packages/patches/emacs-browse-at-remote-cgit-gnu.patch \
%D%/packages/patches/emacs-exec-path.patch \
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
%D%/packages/patches/emacs-json-reformat-fix-tests.patch \
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 349ae0d20..c4468c817 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -7027,39 +7027,35 @@ Idris.")
(license license:gpl3+)))
(define-public emacs-browse-at-remote
- (let ((commit "31dcf77d7c89a12f230e2b2332585db2c44530ef")
- (revision "1"))
- (package
- (name "emacs-browse-at-remote")
- (version (string-append "0.9.0-" revision "."
- (string-take commit 7)))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/rmuslimov/browse-at-remote.git";)
- (commit commit)))
- (file-name (string-append name "-" version "-checkout"))
- (patches
- (search-patches "emacs-browse-at-remote-cgit-gnu.patch"))
- (sha256
- (base32
- "017cb8lf7zbg0jmr7zxzd7d5kz2jy35cvw5vcpdmq1fdr3wqwkgj"))))
- (build-system emacs-build-system)
- (propagated-inputs
- `(("emacs-f" ,emacs-f)
- ("emacs-s" ,emacs-s)))
- (native-inputs
- `(("ert-runner" ,ert-runner)))
- (arguments
- `(#:tests? #t
- #:test-command '("ert-runner")))
- (home-page "https://github.com/rmuslimov/browse-at-remote";)
- (synopsis "Open github/gitlab/bitbucket/stash page from Emacs")
- (description
- "This Emacs package allows you to open a target page on
+ (package
+ (name "emacs-browse-at-remote")
+ (version "0.10.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/rmuslimov/browse-at-remote/archive/";
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0ymslsp6i1naw25zckv25bf4aaq6qwkbkn95qyzlwg869l802686"))))
+ (build-system emacs-build-system)
+ (propagated-inputs
+ `(("emacs-f" ,emacs-f)
+ ("emacs-s" ,emacs-s)))
+ (native-inputs
+ `(("ert-runner" ,ert-runner)))
+ (arguments
+ `(#:tests? #t
+ #:test-command '("ert-runner")))
+ (home-page "https://github.com/rmuslimov/browse-at-remote";)
+ (synopsis "Open github/gitlab/bitbucket/stash page from Emacs")
+ (description
+ "This Emacs package allows you to open a target page on
github/gitlab (or bitbucket) by calling @code{browse-at-remote} command.
It supports dired buffers and opens them in tree mode at destination.")
- (license license:gpl3+))))
+ (license license:gpl3+)))
(define-public emacs-tiny
(package
diff --git a/gnu/packages/patches/emacs-browse-at-remote-cgit-gnu.patch
b/gnu/packages/patches/emacs-browse-at-remote-cgit-gnu.patch
deleted file mode 100644
index b90017fdb..000000000
--- a/gnu/packages/patches/emacs-browse-at-remote-cgit-gnu.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Copyright © 2018 Oleg Pykhalov <address@hidden>
-
-This patch adds a support for Git repositories hosted on git.savannah.gnu.org.
-
-Upstream bug URL:
-
-https://github.com/rmuslimov/browse-at-remote/pull/46
-
-From cd2ccdaef8b1d97337d790175f71cc3dbcfcff64 Mon Sep 17 00:00:00 2001
-From: Oleg Pykhalov <address@hidden>
-Date: Fri, 26 Jan 2018 00:05:30 +0300
-Subject: [PATCH] Add support for repositories that are hosted on gnu cgit
-
----
- browse-at-remote.el | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/browse-at-remote.el b/browse-at-remote.el
-index 66967b3..e210d18 100644
---- a/browse-at-remote.el
-+++ b/browse-at-remote.el
-@@ -44,7 +44,8 @@
- (defcustom browse-at-remote-remote-type-domains
- '(("bitbucket.org" ."bitbucket")
- ("github.com" . "github")
-- ("gitlab.com" . "gitlab"))
-+ ("gitlab.com" . "gitlab")
-+ ("git.savannah.gnu.org" . "gnu"))
- "Alist of domain patterns to remote types."
-
- :type '(alist :key-type (string :tag "Domain")
-@@ -199,6 +200,24 @@ If HEAD is detached, return nil."
- (if (fboundp formatter)
- formatter nil)))
-
-+(defun browse-at-remote-gnu-format-url (repo-url)
-+ "Get a gnu formatted URL."
-+ (replace-regexp-in-string
-+ (concat "https://"; (car (rassoc "gnu"
browse-at-remote-remote-type-domains))
-+ "/\\(git\\).*\\'")
-+ "cgit" repo-url nil nil 1))
-+
-+(defun browse-at-remote--format-region-url-as-gnu (repo-url location filename
&optional linestart lineend)
-+ "URL formatter for gnu."
-+ (let ((repo-url (browse-at-remote-gnu-format-url repo-url)))
-+ (cond
-+ (linestart (format "%s.git/tree/%s?h=%s#n%d" repo-url filename location
linestart))
-+ (t (format "%s.git/tree/%s?h=%s" repo-url filename location)))))
-+
-+(defun browse-at-remote--format-commit-url-as-gnu (repo-url commithash)
-+ "Commit URL formatted for gnu"
-+ (format "%s.git/commit/?id=%s" (browse-at-remote-gnu-format-url repo-url)
commithash))
-+
- (defun browse-at-remote--format-region-url-as-github (repo-url location
filename &optional linestart lineend)
- "URL formatted for github."
- (cond
---
-2.15.1
-
--
2.18.0
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#32023] [PATCH] gnu: emacs-browse-at-remote: Update to 0.10.0. |
|
Date: |
Sun, 01 Jul 2018 19:52:52 +0300 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
Hello Marius,
Thank you for review.
Marius Bakke <address@hidden> writes:
> Oleg Pykhalov <address@hidden> writes:
>
>> * gnu/packages/emacs.scm (emacs-browse-at-remote): Update to 0.10.0.
>> * gnu/packages/patches/emacs-browse-at-remote-cgit-gnu.patch: Delete file.
>> * gnu/local.mk (dist_patch_DATA): Remove it.
[…]
>> + (arguments
>> + `(#:tests? #t
>
> Is this not the default for emacs-build-system? It was there from
> before, so not related to this patch. Just curious :-)
No tests by default in ‘emacs-build-system’.
With ‘#:tests #t’
--8<---------------cut here---------------start------------->8---
starting phase `check'
Warning: Lisp directory
'/tmp/guix-build-ert-runner-0.7.0.drv-0/ert-runner.el-0.7.0': No such file or
directory
...
Ran 3 tests in 0.005 seconds
phase `check' succeeded after 0.1 seconds
--8<---------------cut here---------------end--------------->8---
Without ‘#:tests #t’:
--8<---------------cut here---------------start------------->8---
starting phase `check'
test suite not run
phase `check' succeeded after 0.0 seconds
--8<---------------cut here---------------end--------------->8---
Pushed as 960231873661365bb6228d62c5452e634d6da5d2
Oleg.
signature.asc
Description: PGP signature
--- End Message ---