diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2019-11-03 14:17:23 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2019-11-03 14:21:43 +0100 |
| commit | 3f0d188f659d7cf1aa86f017788652c90edfc9e4 (patch) | |
| tree | c44a3b81bc1f9af94f0c09d22f3e810db4d3b3ba /pkgs/tools/filesystems | |
| parent | 828061351c8aa3e8aa90f97c60c01fe4e6b189f8 (diff) | |
| download | nixpkgs-3f0d188f659d7cf1aa86f017788652c90edfc9e4.tar nixpkgs-3f0d188f659d7cf1aa86f017788652c90edfc9e4.tar.gz nixpkgs-3f0d188f659d7cf1aa86f017788652c90edfc9e4.tar.bz2 nixpkgs-3f0d188f659d7cf1aa86f017788652c90edfc9e4.tar.lz nixpkgs-3f0d188f659d7cf1aa86f017788652c90edfc9e4.tar.xz nixpkgs-3f0d188f659d7cf1aa86f017788652c90edfc9e4.tar.zst nixpkgs-3f0d188f659d7cf1aa86f017788652c90edfc9e4.zip | |
sshfs: 3.5.2 -> 3.6.0
The patch prevents the following error: [2/7] Generating manpages with a custom command. ../sshfs.rst:210: (ERROR/3) Unexpected indentation. ../sshfs.rst:211: (WARNING/2) Block quote ends without a blank line; unexpected unindent.
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/sshfs-fuse/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 85cd0609920..e01cb4dd702 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, docutils, makeWrapper +{ stdenv, fetchFromGitHub, fetchpatch, meson, pkgconfig, ninja, docutils, makeWrapper , fuse3, glib , which, python3Packages , openssh }: stdenv.mkDerivation rec { - version = "3.5.2"; + version = "3.6.0"; pname = "sshfs-fuse"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "0gvk8snivpi2sjidjnd9ypc66ny7lr0z9v4swl56rwjv539dkbx2"; + sha256 = "0l4a6azsp920fhl4safxjam6821b77zxhw8mjgm33f60pksslww0"; }; + patches = [ (fetchpatch { + url = "https://github.com/libfuse/sshfs/commit/a548abd1f33a8423bec72724a5f48eb96fa55dd2.patch"; + sha256 = "03rmks4bz06m9v8s5xjybvmcdw3d09x721jp4i6v0w8pfwsn98w1"; + }) ]; + nativeBuildInputs = [ meson pkgconfig ninja docutils makeWrapper ]; buildInputs = [ fuse3 glib ]; checkInputs = [ which python3Packages.pytest ]; |