public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sshfs: 3.4.0 -> 3.5.0

Browse Source
This commit is contained in:
Michael Weiss 2018-08-28 17:59:16 +02:00
parent bbe620f77b
commit 98fbb44114
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/tools/filesystems/sshfs-fuse/default.nix
View File

@ -1,20 +1,22 @@
{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, glib, fuse3 { stdenv, fetchFromGitHub, meson, pkgconfig, ninja, docutils
, docutils, which, python3Packages , fuse3, glib
, which, python3Packages
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.4.0"; version = "3.5.0";
name = "sshfs-fuse-${version}"; name = "sshfs-fuse-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libfuse"; owner = "libfuse";
repo = "sshfs"; repo = "sshfs";
rev = "sshfs-${version}"; rev = "sshfs-${version}";
sha256 = "1mbhjgw6797bln579pfwmn79gs8isnv57z431lbfw7j8xkh75awl"; sha256 = "1mczf13ic5ycfhcxmxma50n5h32vygcll0d8m39vam237s95aqy6";
}; };
nativeBuildInputs = [ meson pkgconfig ninja docutils ]; nativeBuildInputs = [ meson pkgconfig ninja docutils ];
buildInputs = [ fuse3 glib ]; buildInputs = [ fuse3 glib ];
checkInputs = [ which python3Packages.pytest ];
NIX_CFLAGS_COMPILE = stdenv.lib.optional NIX_CFLAGS_COMPILE = stdenv.lib.optional
(stdenv.system == "i686-linux") (stdenv.system == "i686-linux")
@ -25,9 +27,15 @@ stdenv.mkDerivation rec {
ln -sf $out/bin/sshfs $out/sbin/mount.sshfs ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
''; '';
checkInputs = [ which ] ++ (with python3Packages; [ python pytest ]); #doCheck = true;
checkPhase = '' checkPhase = ''
# The tests need fusermount:
mkdir bin && cp ${fuse3}/bin/fusermount3 bin/fusermount
export PATH=bin:$PATH
# Can't access /dev/fuse within the sandbox: "FUSE kernel module does not seem to be loaded"
substituteInPlace test/util.py --replace "/dev/fuse" "/dev/null"
# TODO: "fusermount executable not setuid, and we are not root"
# We should probably use a VM test instead
python3 -m pytest test/ python3 -m pytest test/
''; '';