diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-24 20:41:42 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-24 20:41:42 +0100 |
commit | cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d (patch) | |
tree | e72cb717dfc1161f4a6a2218cc11dc6a07bdec05 /pkgs/tools/filesystems | |
parent | 09e2990117c2eb0f9ab054ecf65cda7d55ca0dfc (diff) | |
parent | 27955d37e97b5a35c83222345f057b322334c7ac (diff) | |
download | nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.tar nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.tar.gz nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.tar.bz2 nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.tar.lz nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.tar.xz nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.tar.zst nixlib-cc8fd11ffb7fe5cd7f1cfa75ea987429f1b2e77d.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/filesystems')
-rw-r--r-- | pkgs/tools/filesystems/catcli/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/disorderfs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/glusterfs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/irods/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/filesystems/s3fs/default.nix | 4 |
5 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index f5dbabaf5834..8f4e9941029b 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ docopt anytree ]; - postPatch = '' patchShebangs . ''; + postPatch = "patchShebangs . "; meta = with lib; { description = "The command line catalog tool for your offline data"; diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix index 497a6ad0e0a2..27dc55fb9263 100644 --- a/pkgs/tools/filesystems/disorderfs/default.nix +++ b/pkgs/tools/filesystems/disorderfs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "disorderfs"; - version = "0.5.6"; + version = "0.5.11"; src = fetchurl { url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.bz2"; - sha256 = "0xlsl6cw1p0d92crknrcf4iabgig0185dzp80qxh9iyjy42d27gk"; + sha256 = "sha256-KqAMKVUykCgVdNyjacZjpVXqVdeob76v0iOuSd4TNIY="; }; nativeBuildInputs = [ pkg-config asciidoc ]; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 5145889407e1..a1e9fad45405 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { ''; configureFlags = [ - ''--localstatedir=/var'' + "--localstatedir=/var" ]; nativeBuildInputs = [ rpcsvc-proto ]; diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 8dfdd96dbeb8..0dce22b8bbba 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -57,8 +57,7 @@ in rec { ''; meta = common.meta // { - longDescription = common.meta.longDescription + '' - This package provides the servers and libraries.''; + longDescription = common.meta.longDescription + "This package provides the servers and libraries."; }; }); @@ -93,8 +92,7 @@ in rec { meta = common.meta // { description = common.meta.description + " CLI clients"; - longDescription = common.meta.longDescription + '' - This package provides the CLI clients, called 'icommands'.''; + longDescription = common.meta.longDescription + "This package provides the CLI clients, called 'icommands'."; }; }); } diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index e0b42711d224..4ff36e3b1d87 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.87"; + version = "1.88"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "09ib3sh6vg3z7cpccj3ysgpdyf84a98lf6nz15a61r4l27h111f2"; + sha256 = "sha256-LxqTKu9F8FqHnjp1a9E/+WbH1Ol6if/OpY7LGsVE9Bw="; }; buildInputs = [ curl openssl libxml2 ] |