Merge staging-next into staging

2021-01-20 01:20:12 +00:00
parent aa36acbfd9 ebdf4f426a
commit b27f238893
178 changed files with 771 additions and 606 deletions
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
      Bcache is a Linux kernel block layer cache. It allows one or more fast
      disk drives such as flash-based solid state drives (SSDs) to act as a
      cache for one or more slower hard disk drives.
-      
+
      This package contains the required user-space tools.

      User documentation is in Documentation/bcache.txt in the Linux kernel
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {

      If the information in the journal are sufficient, ext4magic can
      recover the most file types, with original filename, owner and group,
-      file mode bits and also the old atime/mtime stamps. 
+      file mode bits and also the old atime/mtime stamps.

      It's much more effective and works much better than extundelete.
    '';
@@ -2,7 +2,7 @@

 stdenv.mkDerivation {
  name = "genext2fs-1.4.1";
-  
+
  src = fetchurl {
    url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz";
    sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0";