unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: kiasoc5 via Guix-patches via <guix-patches@gnu.org>
To: 56670@debbugs.gnu.org
Subject: [bug#56670] [PATCH] gnu: sshfs: Update to 3.7.3.
Date: Thu, 28 Jul 2022 18:33:14 +0000	[thread overview]
Message-ID: <20220728183314.4de3520d@aria> (raw)
In-Reply-To: <20220720153922.2be9c843@aria>

[-- Attachment #1: Type: text/plain, Size: 2400 bytes --]

Patch got mangled by word wrap, attaching it instead. Sorry!

On Wed, Jul 20 2022, 03:39:22 PM +0000
kiasoc5 <kiasoc5@disroot.org> wrote:

> From 677c2cb792dde411f57e7ea9b3a20f1a1d35310d Mon Sep 17 00:00:00 2001
> From: kiasoc5 <kiasoc5@disroot.org>
> Date: Wed, 20 Jul 2022 11:25:31 -0400
> Subject: [PATCH] gnu: sshfs: Update to 3.7.3.
> 
> * gnu/packages/linux.scm (sshfs): Update to 3.7.3.
> [build-system]: Replace gnu-build-system with cmake-build-system.
> [arguments]: Replace 'check with call to pytest.
> [native-inputs]: Add dependencies to generate man page and run tests.
> ---
>  gnu/packages/linux.scm | 26 ++++++++++++++++++++------
>  1 file changed, 20 insertions(+), 6 deletions(-)
> 
> diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
> index 19ba30aa16..63a29e8bc7 100644
> --- a/gnu/packages/linux.scm
> +++ b/gnu/packages/linux.scm
> @@ -3472,20 +3472,34 @@ (define-public unionfs-fuse/static
>  (define-public sshfs
>    (package
>      (name "sshfs")
> -    (version "2.10")
> +    (version "3.7.3")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append
> "https://github.com/libfuse/sshfs/releases/" "download/sshfs-" version
> "/sshfs-" version
> -                                  ".tar.gz"))
> +                                  ".tar.xz"))
>                (sha256
>                 (base32
> -
> "00fir2iykdx11g8nv5gijg0zjrp2g3ldypnv0yi6lq3h5pg5v13h"))))
> -    (build-system gnu-build-system)
> +
> "169fkilv060afgp9h7hvsbkg02bd1y77kmx06x0s7q1cvmxww62j"))))
> +    (build-system meson-build-system)
> +    (arguments
> +     (list
> +      #:phases
> +      #~(modify-phases %standard-phases
> +          (replace 'check
> +            (lambda* (#:key tests? #:allow-other-keys)
> +              (when tests?
> +                (invoke "python3" "-m" "pytest" "test/"))))))) ;; one
> test is skipped, fuse kernel module is not loaded (inputs
> -     (list fuse glib))
> +     (list fuse-3 glib))
>      (native-inputs
> -     (list pkg-config))
> +     (list pkg-config
> +           python-docutils ;; man page
> +           ;; tests
> +           which
> +           python
> +           python-pytest
> +           fuse))
>      (home-page "https://github.com/libfuse/sshfs")
>      (synopsis "Mount remote file systems over SSH")
>      (description
> 
> base-commit: be7b314f3fe22273e935accac22f313e44d3d970


[-- Attachment #2: 0001-gnu-sshfs-Update-to-3.7.3.patch --]
[-- Type: text/x-patch, Size: 2216 bytes --]

From 677c2cb792dde411f57e7ea9b3a20f1a1d35310d Mon Sep 17 00:00:00 2001
From: kiasoc5 <kiasoc5@disroot.org>
Date: Wed, 20 Jul 2022 11:25:31 -0400
Subject: [PATCH] gnu: sshfs: Update to 3.7.3.

* gnu/packages/linux.scm (sshfs): Update to 3.7.3.
[build-system]: Replace gnu-build-system with cmake-build-system.
[arguments]: Replace 'check with call to pytest.
[native-inputs]: Add dependencies to generate man page and run tests.
---
 gnu/packages/linux.scm | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 19ba30aa16..63a29e8bc7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3472,20 +3472,34 @@ (define-public unionfs-fuse/static
 (define-public sshfs
   (package
     (name "sshfs")
-    (version "2.10")
+    (version "3.7.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/libfuse/sshfs/releases/"
                                   "download/sshfs-" version "/sshfs-" version
-                                  ".tar.gz"))
+                                  ".tar.xz"))
               (sha256
                (base32
-                "00fir2iykdx11g8nv5gijg0zjrp2g3ldypnv0yi6lq3h5pg5v13h"))))
-    (build-system gnu-build-system)
+                "169fkilv060afgp9h7hvsbkg02bd1y77kmx06x0s7q1cvmxww62j"))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "python3" "-m" "pytest" "test/"))))))) ;; one test is skipped, fuse kernel module is not loaded
     (inputs
-     (list fuse glib))
+     (list fuse-3 glib))
     (native-inputs
-     (list pkg-config))
+     (list pkg-config
+           python-docutils ;; man page
+           ;; tests
+           which
+           python
+           python-pytest
+           fuse))
     (home-page "https://github.com/libfuse/sshfs")
     (synopsis "Mount remote file systems over SSH")
     (description

base-commit: be7b314f3fe22273e935accac22f313e44d3d970
-- 
2.37.1


  reply	other threads:[~2022-07-28 18:35 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-20 15:39 [bug#56670] [PATCH] gnu: sshfs: Update to 3.7.3 kiasoc5 via Guix-patches via
2022-07-28 18:33 ` kiasoc5 via Guix-patches via [this message]
2022-08-04  7:13   ` bug#56670: " 宋文武 via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220728183314.4de3520d@aria \
    --to=guix-patches@gnu.org \
    --cc=56670@debbugs.gnu.org \
    --cc=kiasoc5@disroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).