From a1c34680b3439507b3c35cb6fce9832464d1ad3d Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 21 Apr 2020 16:01:27 +0200 Subject: gnu: emacs-dired-toggle-sudo: Update to 1.0-0.13bbe52. * gnu/packages/emacs-xyz.scm (emacs-dired-toggle-sudo): Update to 1.0-0.13bbe52. * gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Leo Famulari --- gnu/local.mk | 4 +- gnu/packages/emacs-xyz.scm | 41 +++++++++--------- .../patches/emacs-dired-toggle-sudo-emacs-26.patch | 49 ---------------------- 3 files changed, 22 insertions(+), 72 deletions(-) delete mode 100644 gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch diff --git a/gnu/local.mk b/gnu/local.mk index ca863a8b9b..e70715000a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -29,7 +29,8 @@ # Copyright © 2020 Brendan Tildesley # Copyright © 2020 Vincent Legoll # Copyright © 2020 R Veera Kumar -# Copyright © 2020 Nicolò Balzarotti +# Copyright © 2020 Michael Rohleder # # This file is part of GNU Guix. # @@ -851,7 +852,6 @@ dist_patch_DATA = \ %D%/packages/patches/elm-compiler-disable-reactor.patch \ %D%/packages/patches/elm-compiler-fix-map-key.patch \ %D%/packages/patches/emacs27-exec-path.patch \ - %D%/packages/patches/emacs-dired-toggle-sudo-emacs-26.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-xyz.scm b/gnu/packages/emacs-xyz.scm index cd80e57efb..32b1868813 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9281,28 +9281,27 @@ information inside the Dired buffer.") (license license:gpl3+)))) (define-public emacs-dired-toggle-sudo - (package - (name "emacs-dired-toggle-sudo") - (version "1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/renard/dired-toggle-sudo") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2")) - (patches - (search-patches - "emacs-dired-toggle-sudo-emacs-26.patch")))) - (build-system emacs-build-system) - (home-page "https://github.com/renard/dired-toggle-sudo") - (synopsis "Browse directory with @code{sudo} privileges") - (description "This package allows for the use of @code{dired} with + (let ((commit "13bbe52c54893f5aa3e56228450ffdd0c9e1d169") + (revision "0")) + (package + (name "emacs-dired-toggle-sudo") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/renard/dired-toggle-sudo") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fw1pb1z6krqd1pfxxhr6rrfr9ckkcb0zsjzbjk0i2i1q5cg6car")))) + (build-system emacs-build-system) + (home-page "https://github.com/renard/dired-toggle-sudo") + (synopsis "Browse directory with @code{sudo} privileges") + (description "This package allows for the use of @code{dired} with @code{sudo} privileges.") - (license license:wtfpl2))) + (license license:wtfpl2)))) (define-public emacs-diredfl (package diff --git a/gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch b/gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch deleted file mode 100644 index d979b113d0..0000000000 --- a/gnu/packages/patches/emacs-dired-toggle-sudo-emacs-26.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3c0f4b27a079b90dc632f5061a81ce28cef24801 Mon Sep 17 00:00:00 2001 -From: eryx67 -Date: Thu, 29 Nov 2018 10:30:20 +0500 -Subject: [PATCH] fix for latest emacs - ---- - dired-toggle-sudo.el | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/dired-toggle-sudo.el b/dired-toggle-sudo.el -index 386921b..fe5898e 100644 ---- a/dired-toggle-sudo.el -+++ b/dired-toggle-sudo.el -@@ -37,17 +37,20 @@ - unless SUDO-USER is provided." - (let* (;; Handle the case of local files. `tramp-dissect-file-name' does - ;; not raise an error anymore. -- (path (if (tramp-tramp-file-p path) path (concat "/:" path))) -+ ;;(path (if (tramp-tramp-file-p path) path (concat "/-::" path))) - (file-vec (or (ignore-errors (tramp-dissect-file-name - path)) - (tramp-dissect-file-name -- (concat "/:" path) 1))) -+ (concat "/-::" path) 1))) - (method (tramp-file-name-method file-vec)) - (user (tramp-file-name-user file-vec)) - (host (tramp-file-name-host file-vec)) -+ (domain (tramp-file-name-domain file-vec)) -+ (port (tramp-file-name-port file-vec)) - (localname (expand-file-name - (tramp-file-name-localname file-vec)))) -- (when (string= system-name host) -+ (when (or (string= (system-name) host) -+ (string= "-" host)) - (setq host nil)) - (cond - ;; remote directory -> sudo -@@ -67,7 +70,7 @@ unless SUDO-USER is provided." - (setq method "sudo" user sudo-user))) - (replace-regexp-in-string - "^/:/" "/" -- (tramp-make-tramp-file-name method user host localname)))) -+ (tramp-make-tramp-file-name method domain user host port localname)))) - - (defun dired-toggle-sudo-find (fname) - "Create a new buffer for file name FNAME." --- -2.22.0 - -- cgit v1.2.3