Merge master into staging

2019-07-25 09:23:01 +00:00
parent aabb651b23 b5d1d50aa9
commit 32fbbc6f9b
193 changed files with 4440 additions and 1950 deletions
--- a/pkgs/tools/filesystems/squashfuse/default.nix
+++ b/pkgs/tools/filesystems/squashfuse/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
    owner = "vasi";
    repo  = "${pname}";
    rev = "540204955134eee44201d50132a5f66a246bcfaf";
-    sha256 = "07jv4qjjz9ky3mw3p5prgs19g1bna9dcd7jjdz8083s1wyipdgcq";
+    sha256 = "062s77y32p80vc24a79z31g90b9wxzvws1xvicgx5fn1pd0xa0q6";
  };

  nativeBuildInputs = [ autoreconfHook libtool pkgconfig ];