diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-24 15:02:29 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-24 15:02:29 +0100 |
| commit | ef935fa1016ba6209a8882f4ccd776c5272a4359 (patch) | |
| tree | 8d4c66fda8f30dc3bb2a1c5ce5da5b7fca999dd8 /pkgs/tools/filesystems | |
| parent | d5d15828b51a7d4fd7eee82c6e9a1b261aa49115 (diff) | |
| parent | dd3eea4b476552cbdf95388179bfdd668d04b8b7 (diff) | |
| download | nixpkgs-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar nixpkgs-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.gz nixpkgs-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.bz2 nixpkgs-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.lz nixpkgs-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.xz nixpkgs-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.zst nixpkgs-ef935fa1016ba6209a8882f4ccd776c5272a4359.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/duperemove/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/sshfs-fuse/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index 56795332a96..208cbb83209 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libgcrypt glib linuxHeaders sqlite ]; - makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "A simple tool for finding duplicated extents and submitting them for deduplication"; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index ddec6b7eff8..1a24cf7e75c 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "3.5.0"; + version = "3.5.1"; name = "sshfs-fuse-${version}"; src = fetchFromGitHub { owner = "libfuse"; repo = "sshfs"; rev = "sshfs-${version}"; - sha256 = "1mczf13ic5ycfhcxmxma50n5h32vygcll0d8m39vam237s95aqy6"; + sha256 = "07ryavfbbzfxaswsbr8ifnnfn6g8yxgxam6mk6gvcskld6rkf6gd"; }; nativeBuildInputs = [ meson pkgconfig ninja docutils ]; |