summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/filesystems
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-06-12 09:22:07 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-06-12 09:22:07 +0200
commit7184efb40af0e740000e678a727922a7f58ac597 (patch)
tree2dcb3900446f284697be5c2c5a2d4696d2d87bcb /pkgs/tools/filesystems
parent3df5b67ae4348b22318f92bdb7d00cb5655495d8 (diff)
parent9edf8f73f76b21f7443123cc1a6fca76c5eed3b1 (diff)
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r--pkgs/tools/filesystems/android-file-transfer/default.nix4
-rw-r--r--pkgs/tools/filesystems/bindfs/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix
index 015408351fde..3a29d272b15b 100644
--- a/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "android-file-transfer";
- version = "3.8";
+ version = "3.9";
src = fetchFromGitHub {
owner = "whoozle";
repo = "android-file-transfer-linux";
rev = "v${version}";
- sha256 = "0sym33a0ccdka2cpzv003n2xniid70z0gkjxx93gd2bajkgs9ggc";
+ sha256 = "1pwayyd5xrmngfrmv2vwr8ns2wi199xkxf7dks8fl9zmlpizg3c3";
};
nativeBuildInputs = [ cmake readline pkgconfig ];
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index ebf5291f43a6..dd44f16c3fec 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, fuse, pkgconfig }:
stdenv.mkDerivation rec {
- version = "1.13.11";
+ version = "1.14.0";
name = "bindfs-${version}";
src = fetchurl {
url = "https://bindfs.org/downloads/${name}.tar.gz";
- sha256 = "0ayadwlc6j1ba0n0dkry4iyp49nxkkj5l4dazzqybl5d5c4n605b";
+ sha256 = "1f1znixdaz4wnr9j6rkrplhbnkz7pdw9927yfikbjvxz8cl6qsdz";
};
dontStrip = true;