Merge master into staging-next

pkgs/os-specific/linux/compsize/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "compsize";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "kilobyte";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0gk2vibfl9fh7biznlbr3dwknrwbm5q5602q95jbjvk185g9z126";
+    sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8=";
   };
 
   buildInputs = [ btrfs-progs ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "btrfs: Find compression type/ratio on a file or set of files";
     homepage    = "https://github.com/kilobyte/compsize";
-    license     = licenses.gpl2;
+    license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ CrazedProgrammer ];
     platforms   = platforms.linux;
   };