Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1512490
2019-04-02 20:56:53 +02:00
parent ba18b47c2a ef5fd41a11
commit 2771375d6e
677 changed files with 14350 additions and 6998 deletions
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "s3fs-fuse-${version}";
-  version = "1.84";
+  version = "1.85";

  src = fetchFromGitHub {
    owner  = "s3fs-fuse";
    repo   = "s3fs-fuse";
    rev    = "v${version}";
-    sha256 = "1iafzlrqrjyphd1p74q5xzhgacc4gzijq8f6mdkvikbdsibch871";
+    sha256 = "0sk2b7bxb2wzni1f39l4976dy47s7hqv62l7x7fwcjp62y22nw7m";
  };

  buildInputs = [ curl openssl libxml2 fuse ];