Merge branch 'master' into staging

Hydra: ?compare=1399476
2017-10-07 10:17:42 +02:00
parent 656a0089f6 893df17c5a
commit ef41fc7f51
89 changed files with 2041 additions and 888 deletions
@@ -2,14 +2,14 @@
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
 }:

-let version = "4.8.2"; in
+let version = "4.13.1"; in

 stdenv.mkDerivation rec {
  name = "btrfs-progs-${version}";

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

  nativeBuildInputs = [ pkgconfig ];