From 1e13edd95a9ddb115f4eb2bd449166e33edc7cf4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 07:06:11 +0000 Subject: [PATCH 1/2] s3fs: 1.85 -> 1.86 --- pkgs/tools/filesystems/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 3fc082dad46..4932f48450f 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "s3fs-fuse"; - version = "1.85"; + version = "1.86"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "0sk2b7bxb2wzni1f39l4976dy47s7hqv62l7x7fwcjp62y22nw7m"; + sha256 = "115zqbspr17xmidhizjmsqv9c7ql2jhmxws8wh59bpz2335kn0q7"; }; buildInputs = [ curl openssl libxml2 fuse ]; From 6e5de6b673dd02868367113619a5ef31a0e904ae Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 8 Feb 2020 04:20:00 -0500 Subject: [PATCH 2/2] s3fs: enable on darwin --- pkgs/tools/filesystems/s3fs/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 4932f48450f..282252b4b13 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse, osxfuse }: stdenv.mkDerivation rec { pname = "s3fs-fuse"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "115zqbspr17xmidhizjmsqv9c7ql2jhmxws8wh59bpz2335kn0q7"; }; - buildInputs = [ curl openssl libxml2 fuse ]; + buildInputs = [ curl openssl libxml2 ] + ++ stdenv.lib.optionals stdenv.isLinux [ fuse ] + ++ stdenv.lib.optionals stdenv.isDarwin [ osxfuse ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; configureFlags = [ @@ -25,6 +27,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mount an S3 bucket as filesystem through FUSE"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; }