diff options
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r-- | pkgs/tools/filesystems/bcachefs-tools/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/default.nix | 18 | ||||
-rw-r--r-- | pkgs/tools/filesystems/ceph/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/dosfstools/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/filesystems/garage/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/filesystems/go-mtpfs/default.nix | 25 | ||||
-rw-r--r-- | pkgs/tools/filesystems/go-mtpfs/deps.nix | 30 | ||||
-rw-r--r-- | pkgs/tools/filesystems/netatalk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/rdfind/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/filesystems/s3fs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/xfsprogs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/xtreemfs/default.nix | 23 |
12 files changed, 82 insertions, 57 deletions
diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index bd8bf1adb9fc8..9abbe2e9a04ae 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation { passthru.tests = { smoke-test = nixosTests.bcachefs; + inherit (nixosTests.installer) bcachefsSimple bcachefsEncrypted bcachefsMulti; }; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index fad1944c4a0eb..f9e5340802eda 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,22 +1,24 @@ { lib, stdenv, fetchurl -, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, pkg-config, python3, xmlto +, pkg-config, python3, sphinx , zstd , acl, attr, e2fsprogs, libuuid, lzo, udev, zlib , runCommand, btrfs-progs +, gitUpdater }: stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.16.2"; + version = "5.17"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-npswOh0P2c6q8gTudMHI+h/VV5TiI9n+K8Yodey9U9I="; + sha256 = "sha256-Y7d4/kwrrRjjcdzljtNUiOCPWDkhNnRU/diFB6PQ2J4="; }; nativeBuildInputs = [ - pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + pkg-config python3 python3.pkgs.setuptools + sphinx ]; buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ udev ]; @@ -47,6 +49,14 @@ stdenv.mkDerivation rec { [ -e $out/success ] ''; }; + + passthru.updateScript = gitUpdater { + inherit pname version; + # No nicer place to find latest release. + url = "https://github.com/kdave/btrfs-progs.git"; + rev-prefix = "v"; + }; + meta = with lib; { description = "Utilities for the btrfs filesystem"; homepage = "https://btrfs.wiki.kernel.org/"; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 1162c4e69b127..678835bf7bf86 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -9,7 +9,7 @@ , gtest , cunit, snappy , makeWrapper -, leveldb, oathToolkit +, leveldb, oath-toolkit , libnl, libcap_ng , rdkafka , nixosTests @@ -161,7 +161,7 @@ in rec { buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit - snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka + snappy lz4 oath-toolkit leveldb libnl libcap_ng rdkafka cryptsetup sqlite lua icu bzip2 ] ++ lib.optionals stdenv.isLinux [ linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 75a39fdfe92e2..e15b4ad1f6450 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv, gettext, xxd }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libiconv, gettext, xxd }: stdenv.mkDerivation rec { pname = "dosfstools"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-2gxB0lQixiHOHw8uTetHekaM57fvUd9zOzSxWnvUz/c="; }; + patches = [ + # macOS build fixes backported from master + # TODO: remove on the next release + (fetchpatch { + url = "https://github.com/dosfstools/dosfstools/commit/77ffb87e8272760b3bb2dec8f722103b0effb801.patch"; + sha256 = "sha256-xHxIs3faHK/sK3vAVoG8JcTe4zAV+ZtkozWIIFBvPWI="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 8799ec5a3d2ab..2818c335176a2 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -1,4 +1,5 @@ -{ lib, rustPlatform, fetchFromGitea, protobuf, testers, garage }: +{ lib, stdenv, rustPlatform, fetchFromGitea, protobuf, testers, Security, garage }: + rustPlatform.buildRustPackage rec { pname = "garage"; version = "0.7.0"; @@ -15,6 +16,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ protobuf ]; + buildInputs = lib.optional stdenv.isDarwin Security; + passthru = { tests.version = testers.testVersion { package = garage; }; }; diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 6a05d71d02183..4bb2a3c24d5fe 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,20 +1,29 @@ -{ pkg-config, libusb1, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, pkg-config, libusb1 }: -buildGoPackage rec { +buildGoModule rec { pname = "go-mtpfs"; - version = "unstable-2018-02-09"; - - goPackagePath = "github.com/hanwen/go-mtpfs"; + version = "1.0.0"; src = fetchFromGitHub { owner = "hanwen"; repo = "go-mtpfs"; - rev = "d6f8f3c05ce0ed31435057ec342268a0735863bb"; - sha256 = "sha256-sz+ikhZGwSIAI2YBSQKURF3WXB8dHgQ/C/dbkXwrDSg="; + rev = "v${version}"; + sha256 = "sha256-HVfB8/MImgZZLx4tcrlYOfQjpAdHMHshEaSsd+n758w="; }; + vendorSha256 = "sha256-OrAEvD2rF0Y0bvCD9TUv/E429lASsvC3uK3qNvbg734="; + + ldflags = [ "-s" "-w" ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; - goDeps = ./deps.nix; + checkFlags = [ "-short" ]; + + meta = with lib; { + description = "A simple FUSE filesystem for mounting Android devices as a MTP device"; + homepage = "https://github.com/hanwen/go-mtpfs"; + license = licenses.bsd3; + maintainers = with maintainers; [ aaronjheng ]; + }; } diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.nix b/pkgs/tools/filesystems/go-mtpfs/deps.nix deleted file mode 100644 index f558a53f7d2d2..0000000000000 --- a/pkgs/tools/filesystems/go-mtpfs/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/hanwen/go-fuse"; - fetch = { - type = "git"; - url = "https://github.com/hanwen/go-fuse"; - rev = "d1c826d19ad0c8d0c7e5b4eb34ee0f2ae09f6cef"; - sha256 = "0hn2iqsb6rip2b05fvcngyh0sazln2h3fx18khq4fv41n1iy11dc"; - }; - } - { - goPackagePath = "github.com/hanwen/usb"; - fetch = { - type = "git"; - url = "https://github.com/hanwen/usb"; - rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1"; - sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "48ac38b7c8cbedd50b1613c0fccacfc7d88dfcdf"; - sha256 = "037vs8sdvq310j3b6z9k62zlby1mzmsr9ha01rcy98dv5v8bkhin"; - }; - } -] diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index e5e873b9ac564..f5eb62cca56e4 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "netatalk"; - version = "3.1.12"; + version = "3.1.13"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2"; - sha256 = "1ld5mnz88ixic21m6f0xcgf8v6qm08j6xabh1dzfj6x47lxghq0m"; + sha256 = "0pg0slvvvq3l6f5yjz9ybijg4i6rs5a6c8wcynaasf8vzsyadbc9"; }; patches = [ diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 912456154744d..c363ee5613745 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nettle }: +{ lib, stdenv, fetchpatch, fetchurl, nettle }: stdenv.mkDerivation rec { pname = "rdfind"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "103hfqzgr6izmj57fcy4jsa2nmb1ax43q4b5ij92pcgpaq9fsl21"; }; + patches = [ + (fetchpatch { + name = "include-limits.patch"; + url = "https://github.com/pauldreik/rdfind/commit/61877de88d782b63b17458a61fcc078391499b29.patch"; + sha256 = "0igzm4833cn905pj84lgr88nd5gx35dnjl8kl8vrwk7bpyii6a8l"; + }) + ]; + buildInputs = [ nettle ]; meta = with lib; { diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index e0755a1eead0e..58ef6442d8d04 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.90"; + version = "1.91"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "sha256-tcoINdkPfIdO0VMQ5tdpKcslpvvgVhaJiDFnS/ix0sc="; + sha256 = "sha256-41IgUgpVZiIzi3N5kgX7PAhgnd+i/FH1o8t5y3Uw14g="; }; buildInputs = [ curl openssl libxml2 fuse ]; diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index e81414a2595f1..c44157a2f026f 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "5.15.0"; + version = "5.16.0"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - sha256 = "0mjdwxr2hhqkfa8xg0v74v3n27sjvlwm90jqnmx0587b60wbzlhk"; + hash = "sha256-eLjImZmb1pBEHLU9fAKrZxKUlAMZxpT/fILiPo5Gu58="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 5f942c9250712..e8f283b096ce7 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -1,5 +1,20 @@ -{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python2 -, lib, valgrind, makeWrapper, fetchFromGitHub, fetchpatch }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, makeWrapper +, ant +, attr +, boost +, cmake +, file +, fuse +, jdk +, openssl +, python3 +, valgrind +, which +}: stdenv.mkDerivation { src = fetchFromGitHub { @@ -13,8 +28,8 @@ stdenv.mkDerivation { pname = "XtreemFS"; version = "1.5.1.81"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ which attr python2 ]; + nativeBuildInputs = [ makeWrapper python3 ]; + buildInputs = [ which attr ]; patches = [ (fetchpatch { |