diff options
Diffstat (limited to 'pkgs/tools/filesystems')
64 files changed, 1204 insertions, 423 deletions
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 48e964bf687d..d9ae2cb74615 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,18 +1,18 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase, qttools }: mkDerivation rec { pname = "android-file-transfer"; - version = "3.9"; + version = "4.1"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "1pwayyd5xrmngfrmv2vwr8ns2wi199xkxf7dks8fl9zmlpizg3c3"; + sha256 = "0xmnwxr649wdzsa1vf3spl387hxs4pq0rldyrsr9hz43da4v081k"; }; nativeBuildInputs = [ cmake readline pkgconfig ]; - buildInputs = [ fuse qtbase ]; + buildInputs = [ fuse qtbase qttools ]; meta = with stdenv.lib; { description = "Reliable MTP client with minimalistic UI"; diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix index 2c7b1c271569..32cde83d749a 100644 --- a/pkgs/tools/filesystems/apfs-fuse/default.nix +++ b/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation { buildInputs = [ fuse3 bzip2 zlib attr ]; nativeBuildInputs = [ cmake ]; + postFixup = '' + ln -s $out/bin/apfs-fuse $out/bin/mount.fuse.apfs-fuse + ''; + meta = with stdenv.lib; { homepage = "https://github.com/sgan81/apfs-fuse"; description = "FUSE driver for APFS (Apple File System)"; diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index eaf9ac634a17..edfcaa0d8f81 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "avfs"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; - sha256 = "035b6y49nzgswf5n70aph8pm48sbv9nqwlnp3wwbq892c39kk4xn"; + sha256 = "1psh8k7g7rb0gn7aygbjv86kxyi9xq07barxksa99nnmq3lc2kjg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index 206e68ce1c29..bab8df1280dd 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bashmount"; - version = "4.3.0"; + version = "4.3.2"; src = fetchFromGitHub { owner = "jamielinux"; repo = "bashmount"; rev = version; - sha256 = "1idjyl5dr8a72w3lg15qx03wgc5mj2ga2v2jkyb8v9gi5ahl03mn"; + sha256 = "1irw47s6i1qwxd20cymzlfw5sv579cw877l27j3p66qfhgadwxrl"; }; installPhase = '' diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index c3b1759bcdd5..6e39ff174588 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, utillinux, bash }: +{ stdenv, fetchurl, pkgconfig, util-linux, bash }: stdenv.mkDerivation rec { pname = "bcache-tools"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ utillinux ]; + buildInputs = [ util-linux ]; # * Remove broken install rules (they ignore $PREFIX) for stuff we don't need # anyway (it's distro specific stuff). diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 26158b0361d5..ee2af363a566 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils -, liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages +{ stdenv, fetchFromGitHub, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils +, liburcu, zlib, libaio, udev, zstd, lz4, valgrind, python3Packages , fuseSupport ? false, fuse3 ? null }: assert fuseSupport -> fuse3 != null; stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "2020-04-04"; + version = "2020-08-25"; - src = fetchgit { - url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d"; - sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g"; + src = fetchFromGitHub { + owner = "koverstreet"; + repo = "bcachefs-tools"; + rev = "487ddeb03c574e902c5b749b4307e87e2150976a"; + sha256 = "1pcid7apxmbl9dyvxcqby3k489wi69k8pl596ddzmkw5gmhgvgid"; }; postPatch = '' @@ -29,10 +30,10 @@ stdenv.mkDerivation { buildInputs = [ libuuid libscrypt libsodium keyutils liburcu zlib libaio - zstd lz4 python3Packages.pytest + zstd lz4 python3Packages.pytest udev valgrind ] ++ stdenv.lib.optional fuseSupport fuse3; - doCheck = true; + doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index e87cecbf8fd3..bdca893a136c 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -1,24 +1,21 @@ -{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, utillinux }: +{ stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils, python3Packages, util-linux }: let - version = "0.6.2"; - sha256 = "05niv9rivd3j3cwcx3n3vjr85wr0l5i76giq9n54d2vdwmn8qjib"; - - bees = stdenv.mkDerivation { + bees = stdenv.mkDerivation rec { pname = "bees"; - inherit version; + version = "0.6.3"; src = fetchFromGitHub { owner = "Zygo"; repo = "bees"; rev = "v${version}"; - inherit sha256; + sha256 = "sha256-brEjr7lhmKDCIDeLq+XP+ZTxv1RvwoUlszMSEYygxv8="; }; buildInputs = [ btrfs-progs # for btrfs/ioctl.h - utillinux # for uuid.h + util-linux # for uuid.h ]; nativeBuildInputs = [ @@ -58,8 +55,9 @@ let in -runCommand "bees-service-${version}" { - inherit bash bees coreutils utillinux; +runCommand "bees-service" { + inherit bash bees coreutils; + utillinux = util-linux; # needs to be a valid shell variable name btrfsProgs = btrfs-progs; # needs to be a valid shell variable name } '' mkdir -p -- "$out/bin" diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index f8968260ce79..e69f76e16304 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.14.7"; + version = "1.14.8"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "1lbqyc9vpgck05n0q3qsvsr34142iv721z6iwxhc5j98370ff9i8"; + sha256 = "15y4brlcrqhxl6z73785m0dr1vp2q3wc6xss08x9jjr0apzmmjp5"; }; dontStrip = true; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 5a6dafae2980..03db1d913e2b 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.6.1"; + version = "5.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1nwnvjdnr9fjj2q2p2vpjabfdhcrwykgj9knjcsqy0c7p1bgbk2h"; + sha256 = "14d7hz07kfczfgmy1ixkgccjn393gpkjn7givz5kwxddcnk5i4xq"; }; nativeBuildInputs = [ @@ -20,17 +20,13 @@ stdenv.mkDerivation rec { # for python cross-compiling _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; - # The i686 case is a quick hack; I don't know what's wrong. - postConfigure = stdenv.lib.optionalString (!stdenv.isi686) '' - export LDSHARED="$LD -shared" - ''; # gcc bug with -O1 on ARM with gcc 4.8 # This should be fine on all platforms so apply universally postPatch = "sed -i s/-O1/-O2/ configure"; postInstall = '' - install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs + install -v -m 444 -D btrfs-completion $out/share/bash-completion/completions/btrfs ''; configureFlags = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"; diff --git a/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch b/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch index b04082537b53..a117408b000f 100644 --- a/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch +++ b/pkgs/tools/filesystems/ceph/0000-fix-SPDK-build-env.patch @@ -1,11 +1,11 @@ ---- a/cmake/modules/BuildSPDK.cmake 2018-08-09 09:22:34.950684960 +0200 -+++ b/cmake/modules/BuildSPDK.cmake 2018-08-09 09:21:59.986964224 +0200 -@@ -16,7 +16,7 @@ +--- a/cmake/modules/BuildSPDK.cmake ++++ b/cmake/modules/BuildSPDK.cmake +@@ -35,7 +35,7 @@ macro(build_spdk) # unset $CFLAGS, otherwise it will interfere with how SPDK sets # its include directory. # unset $LDFLAGS, otherwise SPDK will fail to mock some functions. -- BUILD_COMMAND env -i PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} $(MAKE) EXTRA_CFLAGS="-fPIC" -+ BUILD_COMMAND env PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} $(MAKE) EXTRA_CFLAGS="-fPIC" C_OPT="-mssse3" +- BUILD_COMMAND env -i PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} ${make_cmd} EXTRA_CFLAGS="${spdk_CFLAGS}" ++ BUILD_COMMAND env -i PATH=$ENV{PATH} CC=${CMAKE_C_COMPILER} ${make_cmd} EXTRA_CFLAGS="${spdk_CFLAGS}" C_OPT="-mssse3" BUILD_IN_SOURCE 1 INSTALL_COMMAND "true") - ExternalProject_Get_Property(spdk-ext source_dir) + unset(make_cmd) diff --git a/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch b/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch new file mode 100644 index 000000000000..f78c7af9e35a --- /dev/null +++ b/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch @@ -0,0 +1,63 @@ +From b9b6faf66ae67648626470cb4fc3f0850ac4d842 Mon Sep 17 00:00:00 2001 +From: David Disseldorp <ddiss@suse.de> +Date: Tue, 1 Sep 2020 13:49:21 +0200 +Subject: [PATCH] cmake: detect and use sigdescr_np() if available + +sys_siglist is deprecated with glibc 2.32. A new thread-safe and +async-signal safe sigdescr_np() function is provided, so use it if +available. + +Fixes: https://tracker.ceph.com/issues/47187 +Signed-off-by: David Disseldorp <ddiss@suse.de> +--- + cmake/modules/CephChecks.cmake | 1 + + src/global/signal_handler.h | 8 +++++--- + src/include/config-h.in.cmake | 3 +++ + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/cmake/modules/CephChecks.cmake b/cmake/modules/CephChecks.cmake +index 23687283a7c6..ca86dcbc73de 100644 +--- a/cmake/modules/CephChecks.cmake ++++ b/cmake/modules/CephChecks.cmake +@@ -24,6 +24,7 @@ check_function_exists(strerror_r HAVE_Strerror_R) + check_function_exists(name_to_handle_at HAVE_NAME_TO_HANDLE_AT) + check_function_exists(pipe2 HAVE_PIPE2) + check_function_exists(accept4 HAVE_ACCEPT4) ++check_function_exists(sigdescr_np HAVE_SIGDESCR_NP) + + include(CMakePushCheckState) + cmake_push_check_state(RESET) +diff --git a/src/global/signal_handler.h b/src/global/signal_handler.h +index 476724201aa9..c101b2e28733 100644 +--- a/src/global/signal_handler.h ++++ b/src/global/signal_handler.h +@@ -20,10 +20,12 @@ + + typedef void (*signal_handler_t)(int); + +-#ifndef HAVE_REENTRANT_STRSIGNAL +-# define sig_str(signum) sys_siglist[signum] +-#else ++#ifdef HAVE_SIGDESCR_NP ++# define sig_str(signum) sigdescr_np(signum) ++#elif HAVE_REENTRANT_STRSIGNAL + # define sig_str(signum) strsignal(signum) ++#else ++# define sig_str(signum) sys_siglist[signum] + #endif + + void install_sighandler(int signum, signal_handler_t handler, int flags); +diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake +index 1ea3703f620c..59bd4273511a 100644 +--- a/src/include/config-h.in.cmake ++++ b/src/include/config-h.in.cmake +@@ -220,6 +220,9 @@ + /* Define to 1 if you have sched.h. */ + #cmakedefine HAVE_SCHED 1 + ++/* Define to 1 if you have sigdescr_np. */ ++#cmakedefine HAVE_SIGDESCR_NP 1 ++ + /* Support SSE (Streaming SIMD Extensions) instructions */ + #cmakedefine HAVE_SSE + diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index fc8ac971da72..1a43d792ad3e 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -1,4 +1,5 @@ { stdenv, runCommand, fetchurl +, fetchpatch , ensureNewerSourcesHook , cmake, pkgconfig , which, git @@ -27,7 +28,7 @@ , nss ? null, nspr ? null # Linux Only Dependencies -, linuxHeaders, utillinux, libuuid, udev, keyutils, rdma-core, rabbitmq-c +, linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c , libaio ? null, libxfs ? null, zfs ? null , ... }: @@ -75,6 +76,26 @@ let none = [ ]; }; + getMeta = description: { + homepage = "https://ceph.com/"; + inherit description; + license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; + maintainers = with maintainers; [ adev ak johanot krav ]; + platforms = [ "x86_64-linux" ]; + }; |