about summary refs log tree commit diff
path: root/nixpkgs/pkgs/tools/filesystems
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/filesystems')
-rw-r--r--nixpkgs/pkgs/tools/filesystems/9pfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/aefs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/avfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/bashmount/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix50
-rw-r--r--nixpkgs/pkgs/tools/filesystems/bindfs/default.nix6
-rw-r--r--nixpkgs/pkgs/tools/filesystems/bonnie/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/boxfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/buttersink/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/catcli/default.nix30
-rw-r--r--nixpkgs/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch70
-rw-r--r--nixpkgs/pkgs/tools/filesystems/ceph/default.nix9
-rw-r--r--nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/convoy/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/cryfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix4
-rw-r--r--nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/davfs2/default.nix17
-rw-r--r--nixpkgs/pkgs/tools/filesystems/dislocker/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/djmount/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/duff/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/duperemove/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/e2tools/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/encfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix4
-rw-r--r--nixpkgs/pkgs/tools/filesystems/extundelete/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/f3/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/fatresize/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/fatsort/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/file-rename/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/fsfs/default.nix4
-rw-r--r--nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix10
-rw-r--r--nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix4
-rw-r--r--nixpkgs/pkgs/tools/filesystems/genimage/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/genromfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/gitfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/grive2/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/httpfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/ifuse/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/irods/common.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/moosefs/default.nix6
-rw-r--r--nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/mtools/default.nix6
-rw-r--r--nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/netatalk/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/rdfind/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/relfs/default.nix51
-rw-r--r--nixpkgs/pkgs/tools/filesystems/rmount/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/s3backer/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix6
-rw-r--r--nixpkgs/pkgs/tools/filesystems/snapraid/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix10
-rw-r--r--nixpkgs/pkgs/tools/filesystems/squashfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/svnfs/default.nix4
-rw-r--r--nixpkgs/pkgs/tools/filesystems/tmsu/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/wdfs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix2
-rw-r--r--nixpkgs/pkgs/tools/filesystems/zerofree/default.nix2
89 files changed, 193 insertions, 242 deletions
diff --git a/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix b/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix
index b9c5c55a8e47..9664526761b9 100644
--- a/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/9pfs/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = https://github.com/mischief/9pfs;
+    homepage = "https://github.com/mischief/9pfs";
     description = "FUSE-based client of the 9P network filesystem protocol";
     maintainers = [ lib.maintainers.eelco ];
     platforms = lib.platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/aefs/default.nix b/nixpkgs/pkgs/tools/filesystems/aefs/default.nix
index 1be33e1299d2..ea94c26248e9 100644
--- a/nixpkgs/pkgs/tools/filesystems/aefs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/aefs/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ fuse ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/edolstra/aefs;
+    homepage = "https://github.com/edolstra/aefs";
     description = "A cryptographic filesystem implemented in userspace using FUSE";
     platforms = platforms.linux;
     maintainers = [ maintainers.eelco ];
diff --git a/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix
index 7f8a8c4f931f..3340bdba0e6d 100644
--- a/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/afpfs-ng/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ fuse readline libgcrypt gmp ];
 
   meta = with stdenv.lib; {
-    homepage    = https://github.com/simonvetter/afpfs-ng;
+    homepage    = "https://github.com/simonvetter/afpfs-ng";
     description = "A client implementation of the Apple Filing Protocol";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ rnhmjoj ];
diff --git a/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix b/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
index 001e644b7e7d..48e964bf687d 100644
--- a/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix
@@ -16,7 +16,7 @@ mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Reliable MTP client with minimalistic UI";
-    homepage = https://whoozle.github.io/android-file-transfer-linux/;
+    homepage = "https://whoozle.github.io/android-file-transfer-linux/";
     license = licenses.lgpl21;
     maintainers = [ maintainers.xaverdh ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/avfs/default.nix b/nixpkgs/pkgs/tools/filesystems/avfs/default.nix
index b66d67fbc9f2..2df5043867aa 100644
--- a/nixpkgs/pkgs/tools/filesystems/avfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/avfs/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    homepage = http://avf.sourceforge.net/;
+    homepage = "http://avf.sourceforge.net/";
     description = "Virtual filesystem that allows browsing of compressed files";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2;
diff --git a/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix b/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix
index d449bf1266a0..5aeff6baaa9a 100644
--- a/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bashmount/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/jamielinux/bashmount;
+    homepage = "https://github.com/jamielinux/bashmount";
     description = "A menu-driven bash script for the management of removable media with udisks";
     maintainers = [ maintainers.koral ];
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix
index d3e790a3cf13..749aa04ebc70 100644
--- a/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       User documentation is in Documentation/bcache.txt in the Linux kernel
       tree.
     '';
-    homepage = https://bcache.evilpiepirate.org/;
+    homepage = "https://bcache.evilpiepirate.org/";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix
index 144ed0a38459..26158b0361d5 100644
--- a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix
@@ -1,30 +1,58 @@
 { stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils
-, liburcu, zlib, libaio, zstd, lz4 }:
+, liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages
+, fuseSupport ? false, fuse3 ? null }:
+
+assert fuseSupport -> fuse3 != null;
 
 stdenv.mkDerivation {
   pname = "bcachefs-tools";
-  version = "2019-10-12";
+  version = "2020-04-04";
 
   src = fetchgit {
     url = "https://evilpiepirate.org/git/bcachefs-tools.git";
-    rev = "6e696ea08703eecd0d1c7b8c520b6f62f06f4f26";
-    sha256 = "0m3valm68vc73b4kydlga17fglxa9bldrjaszlladzl5bd0zb967";
+    rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d";
+    sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g";
   };
 
-  enableParallelBuilding = true;
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 ];
-  installFlags = [ "PREFIX=${placeholder "out"}" ];
-
-  preInstall = ''
+  postPatch = ''
     substituteInPlace Makefile \
+      --replace "pytest-3" "pytest --verbose" \
       --replace "INITRAMFS_DIR=/etc/initramfs-tools" \
                 "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools"
   '';
 
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+
+  buildInputs = [
+    libuuid libscrypt libsodium keyutils liburcu zlib libaio
+    zstd lz4 python3Packages.pytest
+  ] ++ stdenv.lib.optional fuseSupport fuse3;
+
+  doCheck = true;
+
+  checkFlags = [
+    "BCACHEFS_TEST_USE_VALGRIND=no"
+  ];
+
+  checkInputs = [
+    valgrind
+  ];
+
+  preCheck = stdenv.lib.optionalString fuseSupport ''
+    rm tests/test_fuse.py
+  '';
+
+  installFlags = [
+    "PREFIX=${placeholder "out"}"
+  ];
+
   meta = with stdenv.lib; {
     description = "Tool for managing bcachefs filesystems";
-    homepage = https://bcachefs.org/;
+    homepage = "https://bcachefs.org/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ davidak chiiruno ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
index 834aa7290abc..065a673eb03b 100644
--- a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, fuse, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "1.14.3";
+  version = "1.14.4";
   pname = "bindfs";
 
   src = fetchurl {
     url    = "https://bindfs.org/downloads/${pname}-${version}.tar.gz";
-    sha256 = "09csi8brp6v98gy9xcl6lkbz1wgs796wch1qviw2wa1n16wd91vw";
+    sha256 = "1vk42bq8y13gv4yvajf65qsh59lscwcaw3xv94qpjxld3786i8c7";
   };
 
   dontStrip = true;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A FUSE filesystem for mounting a directory to another location";
-    homepage    = https://bindfs.org;
+    homepage    = "https://bindfs.org";
     license     = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ lovek323 ];
     platforms   = stdenv.lib.platforms.unix;
diff --git a/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix b/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix
index 57dc51e41115..ab49ce02225f 100644
--- a/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ perl ];
 
   meta = {
-    homepage = http://www.coker.com.au/bonnie++/;
+    homepage = "http://www.coker.com.au/bonnie++/";
     description = "Hard drive and file system benchmark suite";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
diff --git a/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix b/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix
index 3ddc95273972..5dba4b4bbf1a 100644
--- a/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/boxfs/default.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation {
       the terminal and in your browser. When you've done using your files,
       unmount the file system with `fusermount -u mountpoint`.
     '';
-    homepage = https://github.com/drotiro/boxfs2;
+    homepage = "https://github.com/drotiro/boxfs2";
     license = licenses.gpl3;
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix
index e3545315d6f7..9b4bf4799676 100644
--- a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Utilities for the btrfs filesystem";
-    homepage = https://btrfs.wiki.kernel.org/;
+    homepage = "https://btrfs.wiki.kernel.org/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/buttersink/default.nix b/nixpkgs/pkgs/tools/filesystems/buttersink/default.nix
index 791d59b7ac27..aa0f317787f8 100644
--- a/nixpkgs/pkgs/tools/filesystems/buttersink/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/buttersink/default.nix
@@ -23,7 +23,7 @@ python2.pkgs.buildPythonApplication rec {
       Sources and destinations can be local btrfs file systems, remote btrfs
       file systems over SSH, or S3 buckets.
     '';
-    homepage = https://github.com/AmesCornish/buttersink/wiki;
+    homepage = "https://github.com/AmesCornish/buttersink/wiki";
     license = licenses.gpl3;
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/catcli/default.nix b/nixpkgs/pkgs/tools/filesystems/catcli/default.nix
new file mode 100644
index 000000000000..4ac6c1d5b21e
--- /dev/null
+++ b/nixpkgs/pkgs/tools/filesystems/catcli/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchFromGitHub
+, buildPythonApplication
+, docopt, anytree
+}:
+
+buildPythonApplication rec {
+
+  pname = "catcli";
+  version = "0.5.13";
+
+  src = fetchFromGitHub {
+    owner = "deadc0de6";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "04mrkqmm2c8fhi1h1hddc4yh3dqhcvkmcwzhj0ggn34v7wavgb5i";
+  };
+
+  propagatedBuildInputs = [ docopt anytree ];
+
+  postPatch = '' patchShebangs . '';
+
+  meta = with stdenv.lib; {
+    description = "The command line catalog tool for your offline data";
+    homepage = "https://github.com/deadc0de6/catcli";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ petersjt014 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch b/nixpkgs/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch
deleted file mode 100644
index 9604da87fb50..000000000000
--- a/nixpkgs/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
-index a8a3ec07c1..bcc9b86c37 100644
---- a/src/pybind/mgr/dashboard/module.py
-+++ b/src/pybind/mgr/dashboard/module.py
-@@ -25,40 +25,6 @@ except ImportError:
- 
- from .services.sso import load_sso_db
- 
--# The SSL code in CherryPy 3.5.0 is buggy.  It was fixed long ago,
--# but 3.5.0 is still shipping in major linux distributions
--# (Fedora 27, Ubuntu Xenial), so we must monkey patch it to get SSL working.
--if cherrypy is not None:
--    v = StrictVersion(cherrypy.__version__)
--    # It was fixed in 3.7.0.  Exact lower bound version is probably earlier,
--    # but 3.5.0 is what this monkey patch is tested on.
--    if StrictVersion("3.5.0") <= v < StrictVersion("3.7.0"):
--        from cherrypy.wsgiserver.wsgiserver2 import HTTPConnection,\
--                                                    CP_fileobject
--
--        def fixed_init(hc_self, server, sock, makefile=CP_fileobject):
--            hc_self.server = server
--            hc_self.socket = sock
--            hc_self.rfile = makefile(sock, "rb", hc_self.rbufsize)
--            hc_self.wfile = makefile(sock, "wb", hc_self.wbufsize)
--            hc_self.requests_seen = 0
--
--        HTTPConnection.__init__ = fixed_init
--
--# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify
--# that the ports its listening on are in fact bound. When using the any address
--# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes)
--# ipv6 isn't yet configured / supported and CherryPy throws an uncaught
--# exception.
--if cherrypy is not None:
--    v = StrictVersion(cherrypy.__version__)
--    # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on
--    # centos:7) and back to at least 3.0.0.
--    if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"):
--        # https://github.com/cherrypy/cherrypy/issues/1100
--        from cherrypy.process import servers
--        servers.wait_for_occupied_port = lambda host, port: None
--
- if 'COVERAGE_ENABLED' in os.environ:
-     import coverage
-     __cov = coverage.Coverage(config_file="{}/.coveragerc".format(os.path.dirname(__file__)),
-diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
-index b7fecf8d85..dfd4160591 100644
---- a/src/pybind/mgr/prometheus/module.py
-+++ b/src/pybind/mgr/prometheus/module.py
-@@ -18,20 +18,6 @@ from rbd import RBD
- DEFAULT_ADDR = '::'
- DEFAULT_PORT = 9283
- 
--# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify
--# that the ports its listening on are in fact bound. When using the any address
--# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes)
--# ipv6 isn't yet configured / supported and CherryPy throws an uncaught
--# exception.
--if cherrypy is not None:
--    v = StrictVersion(cherrypy.__version__)
--    # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on
--    # centos:7) and back to at least 3.0.0.
--    if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"):
--        # https://github.com/cherrypy/cherrypy/issues/1100
--        from cherrypy.process import servers
--        servers.wait_for_occupied_port = lambda host, port: None
--
- # cherrypy likes to sys.exit on error.  don't let it take us down too!
- def os_exit_noop(*args, **kwargs):
-     pass
diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
index abf6ed1361b9..ea610dfcc7f0 100644
--- a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix
@@ -93,7 +93,7 @@ let
   ]);
   sitePackages = ceph-python-env.python.sitePackages;
 
-  version = "14.2.7";
+  version = "14.2.8";
 in rec {
   ceph = stdenv.mkDerivation {
     pname = "ceph";
@@ -101,12 +101,11 @@ in rec {
 
     src = fetchurl {
       url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
-      sha256 = "0qiqhm6hvz299q54k3i4crnb5dhpq6xnn2yqih9pxn9van0dq1ln";
+      sha256 = "0p7pjycqhxqg1mmix8ykx3xqq01d560p54iiidxps0rcvwfkyyki";
     };
 
     patches = [
       ./0000-fix-SPDK-build-env.patch
-      ./0000-dont-check-cherrypy-version.patch
     ];
 
     nativeBuildInputs = [
@@ -174,7 +173,7 @@ in rec {
     doCheck = false; # uses pip to install things from the internet
 
     meta = {
-      homepage = https://ceph.com/;
+      homepage = "https://ceph.com/";
       description = "Distributed storage system";
       license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ];
       maintainers = with maintainers; [ adev ak krav johanot ];
@@ -186,7 +185,7 @@ in rec {
 
   ceph-client = runCommand "ceph-client-${version}" {
      meta = {
-        homepage = https://ceph.com/;
+        homepage = "https://ceph.com/";
         description = "Tools needed to mount Ceph's RADOS Block Devices";
         license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ];
         maintainers = with maintainers; [ adev ak johanot krav ];
diff --git a/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix b/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix
index 6c0a6c287031..c18bbe5a4559 100644
--- a/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/chunkfs/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa";
-    homepage = http://chunkfs.florz.de/;
+    homepage = "http://chunkfs.florz.de/";
     license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; linux;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix b/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix
index 533bb2322e72..5beff7bf1c5c 100644
--- a/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/ciopfs/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
 
   meta = {
-    homepage = http://www.brain-dump.org/projects/ciopfs/;
+    homepage = "http://www.brain-dump.org/projects/ciopfs/";
     description = "A case-insensitive filesystem layered on top of any other filesystem";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/convoy/default.nix b/nixpkgs/pkgs/tools/filesystems/convoy/default.nix
index 00ef368ad3da..77d6dca066a4 100644
--- a/nixpkgs/pkgs/tools/filesystems/convoy/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/convoy/default.nix
@@ -17,7 +17,7 @@ buildGoPackage rec {
   buildInputs = [lvm2];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/rancher/convoy;
+    homepage = "https://github.com/rancher/convoy";
     description = "A Docker volume plugin, managing persistent container volumes.";
     license = licenses.asl20;
     maintainers = with maintainers; [ offline ];
diff --git a/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix b/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix
index 93a70f1f0881..8f7f4f1a313f 100644
--- a/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Cryptographic filesystem for the cloud";
-    homepage    = https://www.cryfs.org;
+    homepage    = "https://www.cryfs.org";
     license     = licenses.lgpl3;
     maintainers = with maintainers; [ peterhoeg c0bw3b ];
     platforms   = with platforms; linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix
index 5636909093e6..a0306693b28e 100644
--- a/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/curlftpfs/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "curlftpfs-0.9.2";
   src = fetchurl {
-    url = mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz;
+    url = "mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz";
     sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f";
   };
   nativeBuildInputs = [ pkgconfig ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Filesystem for accessing FTP hosts based on FUSE and libcurl";
-    homepage = http://curlftpfs.sourceforge.net;
+    homepage = "http://curlftpfs.sourceforge.net";
     license = licenses.gpl2;
     platforms = platforms.linux;
 
diff --git a/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix b/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix
index 0890db67fe72..3548cf0a3dca 100644
--- a/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
 
   meta = {
-    homepage = http://www.darlinghq.org/;
+    homepage = "http://www.darlinghq.org/";
     description = "Darling lets you open macOS dmgs on Linux";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl3;
diff --git a/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix b/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix
index 366db929f582..e3e4444c6c18 100644
--- a/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix
@@ -1,5 +1,7 @@
 { stdenv
 , fetchurl
+, fetchpatch
+, autoreconfHook
 , neon
 , procps
 , substituteAll
@@ -14,6 +16,10 @@ stdenv.mkDerivation rec {
     sha256 = "00fqadhmhi2bmdar5a48nicmjcagnmaj9wgsvjr6cffmrz6pcx21";
   };
 
+  nativeBuildInputs = [
+    autoreconfHook # neon-0.31.patch requires reconfiguration
+  ];
+
   buildInputs = [ neon zlib ];
 
   patches = [
@@ -23,6 +29,15 @@ stdenv.mkDerivation rec {
       src = ./0001-umount_davfs-substitute-ps-command.patch;
       ps = "${procps}/bin/ps";
     })
+
+    # Fix build with neon 0.31
+    # http://savannah.nongnu.org/bugs/?58101
+    (fetchpatch {
+      name = "neon-0.31.patch";
+      url = "http://savannah.nongnu.org/bugs/download.php?file_id=48737";
+      sha256 = "EtQfcstWkn8AcbZo93midGt076gq20AvGGJyQ3FO/YQ=";
+      extraPrefix = ""; # empty means add 'a/' and 'b/'
+    })
   ];
 
   configureFlags = [ "--sysconfdir=/etc" ];
@@ -33,7 +48,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    homepage = https://savannah.nongnu.org/projects/davfs2;
+    homepage = "https://savannah.nongnu.org/projects/davfs2";
     description = "Mount WebDAV shares like a typical filesystem";
     license = stdenv.lib.licenses.gpl3Plus;
 
diff --git a/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix b/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix
index cf87f9ca98e0..10e6e2f9c801 100644
--- a/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/dislocker/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Read BitLocker encrypted partitions in Linux";
-    homepage    = https://github.com/aorimn/dislocker;
+    homepage    = "https://github.com/aorimn/dislocker";
     license     = licenses.gpl2;
     maintainers = with maintainers; [ elitak ];
     platforms   = platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/djmount/default.nix b/nixpkgs/pkgs/tools/filesystems/djmount/default.nix
index e3c8c2944fba..15086d28c988 100644
--- a/nixpkgs/pkgs/tools/filesystems/djmount/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/djmount/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ fuse];
 
   meta = {
-    homepage = http://djmount.sourceforge.net/;
+    homepage = "http://djmount.sourceforge.net/";
     description = "UPnP AV client, mounts as a Linux filesystem the media content of compatible UPnP AV devices";
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.jagajaga ];
diff --git a/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix b/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix
index 369d2e74f301..5af1580d0a51 100644
--- a/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Utilities for creating and checking FAT and VFAT file systems";
-    homepage = https://github.com/dosfstools/dosfstools;
+    homepage = "https://github.com/dosfstools/dosfstools";
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     license = stdenv.lib.licenses.gpl3;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/duff/default.nix b/nixpkgs/pkgs/tools/filesystems/duff/default.nix
index d68ad10bd0dc..48511b97c04e 100644
--- a/nixpkgs/pkgs/tools/filesystems/duff/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/duff/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
       Duff is a Unix command-line utility for quickly finding duplicates in
       a given set of files.
     '';
-    homepage = https://duff.dreda.org/;
+    homepage = "https://duff.dreda.org/";
     license = licenses.zlib;
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix b/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix
index 0950445bd3ec..53ebbb2f8d44 100644
--- a/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/duperemove/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A simple tool for finding duplicated extents and submitting them for deduplication";
-    homepage = https://github.com/markfasheh/duperemove;
+    homepage = "https://github.com/markfasheh/duperemove";
     license = licenses.gpl2;
     maintainers = with maintainers; [ bluescreen303 thoughtpolice ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
index c23e60e79b2c..469ed6fdf343 100644
--- a/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://e2fsprogs.sourceforge.net/;
+    homepage = "http://e2fsprogs.sourceforge.net/";
     description = "Tools for creating and checking ext2/ext3/ext4 filesystems";
     license = licenses.gpl2;
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix b/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix
index 14f6afa99f0c..9c86ced90f7f 100644
--- a/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/e2tools/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = http://home.earthlink.net/~k_sheff/sw/e2tools/;
+    homepage = "http://home.earthlink.net/~k_sheff/sw/e2tools/";
     description = "Utilities to read/write/manipulate files in an ext2/ext3 filesystem";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/encfs/default.nix b/nixpkgs/pkgs/tools/filesystems/encfs/default.nix
index 19767b7013ae..24aa52e366f1 100644
--- a/nixpkgs/pkgs/tools/filesystems/encfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/encfs/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An encrypted filesystem in user-space via FUSE";
-    homepage = https://vgough.github.io/encfs;
+    homepage = "https://vgough.github.io/encfs";
     license = with licenses; [ gpl3 lgpl3 ];
     platforms = with platforms; linux;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix b/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix
index 1e1edfab8dd1..19e0e4ee63ec 100644
--- a/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     (fetchpatch {
-        url = https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch;
+        url = "https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch";
         sha256 = "1accydd8kigid68yir2fbihm3r3x8ws3iyznp25snkx41w6y6x8c";
     })
     ./glibc-fix.patch
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
       It's much more effective and works much better than extundelete.
     '';
-    homepage = http://ext4magic.sourceforge.net/ext4magic_en.html;
+    homepage = "http://ext4magic.sourceforge.net/ext4magic_en.html";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.rkoe ];
diff --git a/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix b/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix
index b84992e1acbb..447f7a656d12 100644
--- a/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Utility that can recover deleted files from an ext3 or ext4 partition";
-    homepage = http://extundelete.sourceforge.net/;
+    homepage = "http://extundelete.sourceforge.net/";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.domenkozar ];
diff --git a/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix
index c5ec523e247d..2ab168a19a5a 100644
--- a/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   patches = [ ./f2fs-tools-cross-fix.patch ];
 
   meta = with stdenv.lib; {
-    homepage = http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/;
+    homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/";
     description = "Userland tools for the f2fs filesystem";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/f3/default.nix b/nixpkgs/pkgs/tools/filesystems/f3/default.nix
index d28875829388..3559579fe80f 100644
--- a/nixpkgs/pkgs/tools/filesystems/f3/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/f3/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Fight Flash Fraud";
-    homepage = http://oss.digirati.com.br/f3/;
+    homepage = "http://oss.digirati.com.br/f3/";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ makefu ];
diff --git a/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix b/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix
index 5a60f8c055e5..c1d048889c70 100644
--- a/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fatresize/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "The FAT16/FAT32 non-destructive resizer";
-    homepage = https://sourceforge.net/projects/fatresize;
+    homepage = "https://sourceforge.net/projects/fatresize";
     platforms = platforms.linux;
     license = licenses.gpl2;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix b/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix
index aee053ad1355..dafe4c851767 100644
--- a/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ help2man ];
 
   meta = with stdenv.lib; {
-    homepage = http://fatsort.sourceforge.net/;
+    homepage = "http://fatsort.sourceforge.net/";
     description = "Sorts FAT partition table, for devices that don't do sorting of files";
     maintainers = [ maintainers.kovirobi ];
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix b/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix
index 8eeb052b22f0..f9b6a941f68f 100644
--- a/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/file-rename/default.nix
@@ -5,7 +5,7 @@ perlPackages.buildPerlPackage {
   version = "0.20";
 
   src = fetchurl {
-    url = mirror://cpan/authors/id/R/RM/RMBARKER/File-Rename-0.20.tar.gz;
+    url = "mirror://cpan/authors/id/R/RM/RMBARKER/File-Rename-0.20.tar.gz";
     sha256 = "1cf6xx2hiy1xalp35fh8g73j67r0w0g66jpcbc6971x9jbm7bvjy";
   };
 
diff --git a/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix b/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix
index 75e5280d391d..3e76653dd3e0 100644
--- a/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fsfs/default.nix
@@ -5,7 +5,7 @@ throw "It still does not build"
 stdenv.mkDerivation {
   name = "fsfs-0.1.1";
   src = fetchurl {
-    url = mirror://sourceforge/fsfs/fsfs-0.1.1.tar.gz;
+    url = "mirror://sourceforge/fsfs/fsfs-0.1.1.tar.gz";
     sha256 = "05wka9aq182li2r7gxcd8bb3rhpns7ads0k59v7w1jza60l57c74";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://fsfs.sourceforge.net/;
+    homepage = "http://fsfs.sourceforge.net/";
     description = "Secure distributed file system in user space";
     license = stdenv.lib.licenses.gpl2Plus;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
index 00f893139427..4c8012de4f14 100644
--- a/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fuse-overlayfs/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }:
 
 stdenv.mkDerivation rec {
   pname = "fuse-overlayfs";
-  version = "0.7.8";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    sha256 = "10wsssf9mxgkgcqks3z02y9ya8xh4wd45lsb1jrvw31wmz9zpalc";
+    sha256 = "0h1ay2l7zyiqplh8whanw68mcfri79lc03wjjrhqji5ddwznv6fa";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
 
   buildInputs = [ fuse3 ];
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "FUSE implementation for overlayfs";
     longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers.";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ma9e ];
+    maintainers = with maintainers; [ ma9e ] ++ teams.podman.members;
     platforms = platforms.unix;
     inherit (src.meta) homepage;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix b/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix
index 41c4cc84f966..2d24cb71bbed 100644
--- a/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/fuseiso/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   ];
 
   meta = {
-    homepage = https://sourceforge.net/projects/fuseiso;
+    homepage = "https://sourceforge.net/projects/fuseiso";
     description = "FUSE module to mount ISO filesystem images";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2;
diff --git a/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix b/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix
index 0ef85abd2b77..8d0c0325aa9d 100644
--- a/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "genext2fs-1.4.1";
   
   src = fetchurl {
-    url = mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz;
+    url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz";
     sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0";
   };
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://genext2fs.sourceforge.net/;
+    homepage = "http://genext2fs.sourceforge.net/";
     description = "A tool to generate ext2 filesystem images without requiring root privileges";
     license = licenses.gpl2;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/tools/filesystems/genimage/default.nix b/nixpkgs/pkgs/tools/filesystems/genimage/default.nix
index e905222ad45e..c3b867fbb601 100644
--- a/nixpkgs/pkgs/tools/filesystems/genimage/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/genimage/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://git.pengutronix.de/cgit/genimage;
+    homepage = "https://git.pengutronix.de/cgit/genimage";
     description = "Generate filesystem images from directory trees";
     license = licenses.gpl2Plus;
     platforms = platforms.all;
diff --git a/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix b/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix
index 1e6c73f725a8..d9d97a424bdd 100644
--- a/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://romfs.sourceforge.net/;
+    homepage = "http://romfs.sourceforge.net/";
     description = "Tool for creating romfs file system images";
     license = licenses.gpl2;
     maintainers = with maintainers; [ pxc ];
diff --git a/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix b/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix
index 7c36e37b33fd..0f66955360f7 100644
--- a/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
       and any subsequent changes made to the files will be
       automatically committed to the remote.
     '';
-    homepage = https://github.com/PressLabs/gitfs;
+    homepage = "https://github.com/PressLabs/gitfs";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.robbinch ];
diff --git a/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix
index 8491bf20e8f1..70a0aff118db 100644
--- a/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix
@@ -43,7 +43,7 @@ buildGoPackage rec {
   meta = with stdenv.lib; {
     description = "Encrypted overlay filesystem written in Go";
     license = licenses.mit;
-    homepage = https://nuetzlich.net/gocryptfs/;
+    homepage = "https://nuetzlich.net/gocryptfs/";
     maintainers = with maintainers; [ flokli offline ];
     platforms = platforms.unix;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/grive2/default.nix b/nixpkgs/pkgs/tools/filesystems/grive2/default.nix
index f325fc97e32c..01b63003d62d 100644
--- a/nixpkgs/pkgs/tools/filesystems/grive2/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/grive2/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A console Google Drive client";
-    homepage = https://github.com/vitalif/grive2;
+    homepage = "https://github.com/vitalif/grive2";
     license = licenses.gpl2;
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix
index b0f7981ebb3c..d97b05abb6c7 100644
--- a/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "HTTPFS2, a FUSE-based HTTP file system for Linux";
 
-    homepage = http://httpfs.sourceforge.net/;
+    homepage = "http://httpfs.sourceforge.net/";
 
     license = stdenv.lib.licenses.gpl2Plus;
 
diff --git a/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix
index 9b1c2b66e7aa..5bb8b4e91e2b 100644
--- a/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/hubicfuse/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/TurboGit/hubicfuse;
+    homepage = "https://github.com/TurboGit/hubicfuse";
     description = "FUSE-based filesystem to access hubic cloud storage";
     platforms = platforms.linux;
     license = licenses.mit;
diff --git a/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix b/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix
index aef6087d3f28..5e6025c03482 100644
--- a/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/ifuse/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig fuse usbmuxd libimobiledevice ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/libimobiledevice/ifuse;
+    homepage = "https://github.com/libimobiledevice/ifuse";
     description = "A fuse filesystem implementation to access the contents of iOS devices";
     longDescription = ''
       Mount directories of an iOS device locally using fuse. By default the media
diff --git a/nixpkgs/pkgs/tools/filesystems/irods/common.nix b/nixpkgs/pkgs/tools/filesystems/irods/common.nix
index 902d7d7d1a1e..fa498263baac 100644
--- a/nixpkgs/pkgs/tools/filesystems/irods/common.nix
+++ b/nixpkgs/pkgs/tools/filesystems/irods/common.nix
@@ -47,7 +47,7 @@ with stdenv;
       important in data management. The development infrastructure supports exhaustive
       testing on supported platforms; plug-in support for microservices, storage resources,
       drivers, and databases; and extensive documentation, training and support services.'';
-    homepage = https://irods.org;
+    homepage = "https://irods.org";
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.bzizou ];
     platforms = stdenv.lib.platforms.all;
diff --git a/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix b/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix
index 8b899da32c10..954393e45897 100644
--- a/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/jfsutils/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "IBM JFS utilities";
-    homepage = http://jfs.sourceforge.net;
+    homepage = "http://jfs.sourceforge.net";
     license = licenses.gpl3;
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix
index 58963753a51a..56afb8f0f55d 100644
--- a/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "A FUSE filesystem for MTP devices like Android phones";
-    homepage = https://github.com/JasonFerrara/jmtpfs;
+    homepage = "https://github.com/JasonFerrara/jmtpfs";
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.coconnor ];
diff --git a/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix b/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix
index 4d90e189b950..94aa07b10437 100644
--- a/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = http://mhddfs.uvw.ru/;
+    homepage = "http://mhddfs.uvw.ru/";
     description = "Combines a several mount points into the single one";
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.makefu ];
diff --git a/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix b/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix
index 6733b3df45ea..086791de787a 100644
--- a/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mkspiffs/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Tool to build and unpack SPIFFS images";
     license = licenses.mit;
-    homepage = https://github.com/igrr/mkspiffs;
+    homepage = "https://github.com/igrr/mkspiffs";
     maintainers = with maintainers; [ haslersn ];
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix
index fe9f1ae11e60..4a912d3b42c2 100644
--- a/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "moosefs";
-  version = "3.0.110";
+  version = "3.0.112";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "16m3mxmik2ifrv1g9cp68k57w8xwsxacws3sh1ajlba4azj9sf8v";
+    sha256 = "04ymwg9r9x9gqjwy9jbjv7zzfgwal0xlfy6z5bwl27m2ys6l5k4a";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://moosefs.com;
+    homepage = "https://moosefs.com";
     description = "Open Source, Petabyte, Fault-Tolerant, Highly Performing, Scalable Network Distributed File System";
     platforms = platforms.linux;
     license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix b/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix
index b453067eaef8..9675f44583a3 100644
--- a/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mp3fs/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       which only understands the MP3 format, or transcode files through
       simple drag-and-drop in a file browser.
     '';
-    homepage = https://khenriks.github.io/mp3fs/;
+    homepage = "https://khenriks.github.io/mp3fs/";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/mtools/default.nix b/nixpkgs/pkgs/tools/filesystems/mtools/default.nix
index b477ad8deace..58bd9340c5b0 100644
--- a/nixpkgs/pkgs/tools/filesystems/mtools/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mtools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mtools-4.0.23";
+  name = "mtools-4.0.24";
 
   src = fetchurl {
     url = "mirror://gnu/mtools/${name}.tar.bz2";
-    sha256 = "1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i";
+    sha256 = "1f9g7g8zspp8nvg1nz869il9pvxpdpchqd0vxfc89y8rjbda5x14";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = https://www.gnu.org/software/mtools/;
+    homepage = "https://www.gnu.org/software/mtools/";
     description = "Utilities to access MS-DOS disks";
     platforms = platforms.unix;
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix b/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix
index bf048113714f..bede0e5fca01 100644
--- a/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/mtpfs/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/cjd/mtpfs;
+    homepage = "https://github.com/cjd/mtpfs";
     description = "FUSE Filesystem providing access to MTP devices";
     platforms = platforms.all;
     license = licenses.gpl3;
diff --git a/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix b/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix
index 0a4207d0715f..faa0a1ebfe86 100644
--- a/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/netatalk/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec{
 
   meta = {
     description = "Apple Filing Protocol Server";
-    homepage = http://netatalk.sourceforge.net/;
+    homepage = "http://netatalk.sourceforge.net/";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ jcumming ];
diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index 003a0e24fb52..b05abd72bac7 100644
--- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -42,7 +42,7 @@ buildPythonApplication rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    homepage = https://fedoraproject.org/wiki/Blivet;
+    homepage = "https://fedoraproject.org/wiki/Blivet";
     description = "Module for management of a system's storage configuration";
     license = with licenses; [ gpl2Plus lgpl21Plus ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
index b5f3a2f3e1f6..3feed2388809 100644
--- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
              ++ stdenv.lib.optional enablePython python;
 
   meta = {
-    homepage = http://code.google.com/p/cryptsetup/;
+    homepage = "http://code.google.com/p/cryptsetup/";
     description = "LUKS for dm-crypt";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ ];
diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
index 804b052b61ae..c8c748b4c45f 100644
--- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
     '';
 
   meta = {
-    homepage = http://sourceware.org/lvm2/;
+    homepage = "http://sourceware.org/lvm2/";
     description = "Tools to support Logical Volume Management (LVM) on Linux";
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
index f30bd958cf3a..b3b18579334f 100644
--- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Tools for the Linux multipathing driver";
-    homepage = http://christophe.varoqui.free.fr/;
+    homepage = "http://christophe.varoqui.free.fr/";
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix
index 046fe81e64ac..2a0ffe326dcb 100644
--- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/parted.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
       which also serves as a sample implementation and script backend.
     '';
 
-    homepage = https://www.gnu.org/software/parted/;
+    homepage = "https://www.gnu.org/software/parted/";
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = [
diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
index 9d067359c44a..0698dcd9ecb7 100644
--- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
@@ -23,7 +23,7 @@ buildPythonApplication rec {
   '';
 
   meta = {
-    homepage = http://fedoraproject.org/wiki/Pykickstart;
+    homepage = "http://fedoraproject.org/wiki/Pykickstart";
     description = "Read and write Fedora kickstart files";
     license = stdenv.lib.licenses.gpl2Plus;
   };
diff --git a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
index e0947b01f51b..f71e7c3a06db 100644
--- a/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
+++ b/nixpkgs/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
@@ -34,7 +34,7 @@ buildPythonApplication rec {
   '';
 
   meta = {
-    homepage = https://fedorahosted.org/pyparted/;
+    homepage = "https://fedorahosted.org/pyparted/";
     description = "Python interface for libparted";
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix b/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix
index 1d402090355f..abe171170d41 100644
--- a/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with stdenv.lib; {
-    homepage = https://www.tuxera.com/community/open-source-ntfs-3g/;
+    homepage = "https://www.tuxera.com/community/open-source-ntfs-3g/";
     description = "FUSE-based NTFS driver with full write support";
     maintainers = with maintainers; [ dezgeg ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix b/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix
index 424f84ec34f9..54cb54b1df4b 100644
--- a/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ nettle ];
 
   meta = with stdenv.lib; {
-    homepage = https://rdfind.pauldreik.se/;
+    homepage = "https://rdfind.pauldreik.se/";
     description = "Removes or hardlinks duplicate files very swiftly";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ maintainers.wmertens ];
diff --git a/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix
index dbc391d00828..896d472b8329 100644
--- a/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     inherit version;
-    homepage = https://sourceforge.net/projects/reiser4/;
+    homepage = "https://sourceforge.net/projects/reiser4/";
     description = "Reiser4 utilities";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix
index 10962f10a8f5..daafdbf231fd 100644
--- a/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    homepage = http://www.namesys.com/;
+    homepage = "http://www.namesys.com/";
     description = "ReiserFS utilities";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/relfs/default.nix b/nixpkgs/pkgs/tools/filesystems/relfs/default.nix
deleted file mode 100644
index c99a95714c09..000000000000
--- a/nixpkgs/pkgs/tools/filesystems/relfs/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, fetchcvs, ocaml, fuse, postgresql, pcre
-, libuuid, gnome_vfs, pkgconfig, GConf }:
-
-stdenv.mkDerivation {
-	name = "relfs-2008.03.05";
-
-	src = fetchcvs {
-		cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
-		module = "relfs";
-		date = "2008-03-05";
-		sha256 = "949f8eff7e74ff2666cccf8a1efbfcce8d54bc41bec6ad6db8c029de7ca832a3";
-	};
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ocaml fuse postgresql pcre libuuid gnome_vfs GConf ];
-
-  buildPhase = ''
-    cd deps
-		sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl
-		make
-		cd ../src
-		sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c
-		sed -e 's@/usr/local/@'\$out/'@' -i Makefile
-		sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile
-		make
-		mkdir -p \$out/bin
-		echo '
-		  createuser -A -D \$1
-			dropdb relfs_\$1 ;
-			rm -rf /tmp/relfs-\$1-tmp;
-			mkdir /tmp/relfs-\$1-tmp;
-			USER=\$1 relfs -f -s /tmp/relfs-\$1-tmp  &
-			sleep 1 &&
-			kill -15 \''${!};
-			rm -rf /tmp/relfs-\$1-tmp ;
-			psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_\$1 OWNER TO \$1;
-				ALTER TABLE obj OWNER TO \$1;
-				ALTER TABLE obj_mimetype OWNER TO \$1;
-				ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant;
-		chmod a+x \$out/bin/relfs_grant;
-  '';
-
-	meta = with stdenv.lib; {
-		description = "A relational filesystem on top of FUSE";
-    homepage = http://relfs.sourceforge.net;
-    license = licenses.gpl2;
-    maintainers = [ maintainers.raskin ];
-    platforms = platforms.linux;
-    broken = true;
-	};
-}
diff --git a/nixpkgs/pkgs/tools/filesystems/rmount/default.nix b/nixpkgs/pkgs/tools/filesystems/rmount/default.nix
index 72172ef5baa2..529fc0244916 100644
--- a/nixpkgs/pkgs/tools/filesystems/rmount/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/rmount/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/Luis-Hebendanz/rmount;
+    homepage = "https://github.com/Luis-Hebendanz/rmount";
     description = "Remote mount utility which parses a json file";
     license = licenses.mit;
     maintainers = [ maintainers.luis ];
diff --git a/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix b/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix
index 8085eb5f2347..96389214c7e0 100644
--- a/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "FUSE for access Playstation 2 IOP IOPRP images and BIOS dumps";
-    homepage = https://github.com/mlafeldt/romdirfs;
+    homepage = "https://github.com/mlafeldt/romdirfs";
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ genesis ];
diff --git a/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix b/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix
index 186da6255ebf..1906f6805354 100644
--- a/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/archiecobbs/s3backer;
+    homepage = "https://github.com/archiecobbs/s3backer";
     description = "FUSE-based single file backing store via Amazon S3";
     license = licenses.gpl2Plus;
     platforms = with platforms; linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix b/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix
index 36ac3630e54d..d4c7d9b76674 100644
--- a/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   version = "4.3";
 
   src = fetchurl {
-    url = mirror://sourceforge/squashfs/squashfs4.3.tar.gz;
+    url = "mirror://sourceforge/squashfs/squashfs4.3.tar.gz";
     sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d";
   };
 
diff --git a/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix
index be46abb2694d..04c7d7c9d2a9 100644
--- a/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   pname = "smbnetfs";
-  version = "0.6.1";
+  version = "0.6.2";
   src = fetchurl {
     url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${pname}-${version}.tar.bz2";
-    sha256 = "02iqjnm6pdwc1q38z56akiwdbp0xisr6qwrmxs1lrk5mq7j8x2w4";
+    sha256 = "19x9978k90w9a65lrpsphk7swsq8zkws9jc27q4zbndrm0r2snr0";
   };
 
   nativeBuildInputs = [ pkgconfig autoconf ];
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     downloadPage = "https://sourceforge.net/projects/smbnetfs/files/smbnetfs";
     updateWalker = true;
     inherit version;
-    homepage = https://sourceforge.net/projects/smbnetfs/;
+    homepage = "https://sourceforge.net/projects/smbnetfs/";
   };
 }
diff --git a/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix b/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix
index b5ffdade98f8..db9afedad96e 100644
--- a/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/snapraid/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ ];
 
   meta = {
-    homepage = http://www.snapraid.it/;
+    homepage = "http://www.snapraid.it/";
     description = "A backup program for disk arrays";
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.makefu ];
diff --git a/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix
index bc8ce7b19c53..767c5168ff20 100644
--- a/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/squashfs-tools-ng/default.nix
@@ -1,21 +1,21 @@
 { stdenv, lib, fetchurl, doxygen, graphviz, perl, pkgconfig
-, lz4, xz, zlib, zstd
+, lz4, lzo, xz, zlib, zstd
 }:
 
 stdenv.mkDerivation rec {
   pname = "squashfs-tools-ng";
-  version = "0.8";
+  version = "0.9";
 
   src = fetchurl {
     url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz";
-    sha256 = "1km18qm9kgmm39aj9yq2aaq99708nmj9cpa9lqf5bp1y617bhh7y";
+    sha256 = "1jx6bga0k07cckpv0yk77kwql7rjiicf9wkbadc8yqhp463xn90q";
   };
 
   nativeBuildInputs = [ doxygen graphviz pkgconfig perl ];
-  buildInputs = [ zlib xz lz4 zstd ];
+  buildInputs = [ zlib xz lz4 lzo zstd ];
 
   meta = with lib; {
-    homepage = https://github.com/AgentD/squashfs-tools-ng;
+    homepage = "https://github.com/AgentD/squashfs-tools-ng";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ qyliss ];
     platforms = platforms.unix;
diff --git a/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix
index f02a913bc257..645633a87e1e 100644
--- a/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/squashfs/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1";
 
   meta = {
-    homepage = http://squashfs.sourceforge.net/;
+    homepage = "http://squashfs.sourceforge.net/";
     description = "Tool for creating and unpacking squashfs filesystems";
     platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix b/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix
index e828698b0e97..27335a9cf5da 100644
--- a/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "FUSE filesystem to mount squashfs archives";
-    homepage = https://github.com/vasi/squashfuse;
+    homepage = "https://github.com/vasi/squashfuse";
     maintainers = [ maintainers.genesis ];
     platforms = platforms.linux;
     license = "BSD-2-Clause";
diff --git a/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix b/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix
index ebfb211732e8..4ae4ebb6f197 100644
--- a/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "svnfs-0.4";
 
   src = fetchurl {
-    url = http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-0.4.tgz;
+    url = "http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-0.4.tgz";
     sha256 = "1lrzjr0812lrnkkwk60bws9k1hq2iibphm0nhqyv26axdsygkfky";
   };
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "FUSE filesystem for accessing Subversion repositories";
-    homepage = http://www.jmadden.eu/index.php/svnfs/;
+    homepage = "http://www.jmadden.eu/index.php/svnfs/";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = stdenv.lib.platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix b/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix
index 67e21ac4c2c4..c7d11d415a51 100644
--- a/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/tmsu/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = http://www.tmsu.org;
+    homepage    = "http://www.tmsu.org";
     description = "A tool for tagging your files using a virtual filesystem";
     maintainers = with maintainers; [ pSub ];
     license     = licenses.gpl3;
diff --git a/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix b/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix
index 62b4b9301397..f18eb9e82271 100644
--- a/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/u3-tool/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tool for controlling the special features of a 'U3 smart drive' USB Flash disk";
-    homepage = https://sourceforge.net/projects/u3-tool/ ;
+    homepage = "https://sourceforge.net/projects/u3-tool/";
     license = licenses.gpl2;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ makefu ];
diff --git a/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix b/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix
index 73272b83989e..695e071effcf 100644
--- a/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "FUSE UnionFS implementation";
-    homepage = https://github.com/rpodgorny/unionfs-fuse;
+    homepage = "https://github.com/rpodgorny/unionfs-fuse";
     license = licenses.bsd3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ orivej ];
diff --git a/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix b/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix
index 50a50ad18f05..af1caecfd748 100644
--- a/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/wdfs/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   buildInputs = [fuse glib neon];
 
   meta = with stdenv.lib; {
-    homepage = http://noedler.de/projekte/wdfs/;
+    homepage = "http://noedler.de/projekte/wdfs/";
     license = licenses.gpl2;
     description = "User-space filesystem that allows to mount a webdav share";
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix b/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix
index aa28ee625969..b5254a92024a 100644
--- a/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://xfs.org/;
+    homepage = "http://xfs.org/";
     description = "SGI XFS utilities";
     license = licenses.lgpl21;
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix b/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix
index b97480d655b4..334aa6ad9c60 100644
--- a/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = https://help.yandex.com/disk/cli-clients.xml;
+    homepage = "https://help.yandex.com/disk/cli-clients.xml";
     description = "A free cloud file storage service";
     maintainers = with stdenv.lib.maintainers; [ smironov jagajaga ];
     platforms = ["i686-linux" "x86_64-linux"];
diff --git a/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix b/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix
index 734c8df9b6ae..f9fd8a3c7f35 100644
--- a/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix
+++ b/nixpkgs/pkgs/tools/filesystems/zerofree/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 '';
 
   meta = {
-    homepage = https://frippery.org/uml/;
+    homepage = "https://frippery.org/uml/";
     description = "Zero free blocks from ext2, ext3 and ext4 file-systems";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2;