mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
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.
This commit is contained in:
parent
828061351c
commit
3f0d188f65
@ -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 ];
|
||||
|
Loading…
Reference in New Issue
Block a user