Merge master into staging-next

2019-08-18 12:53:44 +02:00
parent b8a79ac677 ffbb4d26f9
commit f65aa21bb2
125 changed files with 3217 additions and 885 deletions
@@ -4,11 +4,11 @@

 stdenv.mkDerivation rec {
  pname = "btrfs-progs";
-  version = "5.1.1";
+  version = "5.2.1";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "06xybs7rglxjqkbzl2409acb3rgmnc5zc0xhyaxsc2p1x5yipfcw";
+    sha256 = "0crjv3i20nyj2dagfw6q7byshscpn6j7wlqch3apkzzzk00lmb1n";
  };

  nativeBuildInputs = [