diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:43:18 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:43:18 +0000 |
commit | a6dea5a6f496ea38f56e3c3b4c5d628361cc029f (patch) | |
tree | 8300ad67b0135e6816ab38a6ac6f8fdaeccda2f0 /nixpkgs/pkgs/tools/filesystems | |
parent | 8779e0045c9f218caeb1dd1bcdc87e2715ed5be5 (diff) | |
parent | 5d3fd3674a66c5b1ada63e2eace140519849c967 (diff) | |
download | nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.gz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.bz2 nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.lz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.xz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.zst nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.zip |
Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'
Diffstat (limited to 'nixpkgs/pkgs/tools/filesystems')
-rw-r--r-- | nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/filesystems/davfs2/default.nix | 5 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index 27447fb2b8a3..ebb9db8670e3 100644 --- a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; - version = "4.20.1"; + version = "4.20.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1kagxh10qf1n38zbpya2ghjiybxnag36h9xyqb26fy6iy4gmsbsn"; + sha256 = "0z0fm3j4ajzsf445381ra8r3zzciyyvfh8vvbjmbyarg2rz8n3w9"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix b/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix index 2b6d0f6e669b..512b5ce85677 100644 --- a/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, neon, zlib }: stdenv.mkDerivation rec { - name = "davfs2-1.5.4"; + name = "davfs2-1.5.5"; src = fetchurl { url = "mirror://savannah/davfs2/${name}.tar.gz"; - sha256 = "1q4ngkzbkq0rfxikvkwg7ccpzi1nkkmlf8bb46326y1aj7qf1i69"; + sha256 = "0bxd62268pix7w1lg7f9y94v34f4l45fdf6clyarj43qmljnlz2q"; }; buildInputs = [ neon zlib ]; @@ -30,6 +30,5 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix index 8a9af4ba13c1..26cef4ac90f2 100644 --- a/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ fuse samba glib attr libsecret ]; + postPatch = '' + substituteInPlace src/function.c --replace "attr/xattr.h" "sys/xattr.h" + ''; + meta = with stdenv.lib; { description = "A FUSE FS for mounting Samba shares"; maintainers = with maintainers; [ raskin ]; |