From 8f285340f31ed3ea7e27915a8d4d7d5ba8d07ce9 Mon Sep 17 00:00:00 2001
From: Charles Duffy <charles@dyfis.net>
Date: Fri, 1 Nov 2019 16:11:27 -0500
Subject: [PATCH] gocryptfs: 1.7 -> 1.7.1

---
 pkgs/tools/filesystems/gocryptfs/default.nix  |  8 ++-----
 pkgs/tools/filesystems/gocryptfs/deps.nix     | 21 +++++++++++++------
 ...unix2syscall_darwin.go-build-failure.patch | 14 -------------
 3 files changed, 17 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/gocryptfs/fix-unix2syscall_darwin.go-build-failure.patch

diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix
index 0e48da746b83..8491bf20e8f1 100644
--- a/pkgs/tools/filesystems/gocryptfs/default.nix
+++ b/pkgs/tools/filesystems/gocryptfs/default.nix
@@ -8,7 +8,7 @@ let
 in
 buildGoPackage rec {
   pname = "gocryptfs";
-  version = "1.7"; # TODO: Drop `patches` with next release. Remove `fix-unix2syscall_darwin.go-build-failure.patch`.
+  version = "1.7.1";
 
   goPackagePath = "github.com/rfjakob/gocryptfs";
 
@@ -19,13 +19,9 @@ buildGoPackage rec {
     owner = "rfjakob";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1sr3i73haw07faqpw785cdda2kna8q3a0zhwab1p3i935rvp4qaa";
+    sha256 = "1zhzhvjhvi6xzib985bsnj9yzp4zsnm91m1679nbab6vm3kanq06";
   };
 
-  # Fixes build on darwin
-  # Source: https://github.com/rfjakob/gocryptfs/commit/b1468a732fa26550f2a6f8a21cc7bd47b65a8c96
-  patches = [ ./fix-unix2syscall_darwin.go-build-failure.patch ];
-
   postPatch = "rm -r tests";
 
   buildFlagsArray = ''
diff --git a/pkgs/tools/filesystems/gocryptfs/deps.nix b/pkgs/tools/filesystems/gocryptfs/deps.nix
index 50f6e89908e9..cebad12327e0 100644
--- a/pkgs/tools/filesystems/gocryptfs/deps.nix
+++ b/pkgs/tools/filesystems/gocryptfs/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hanwen/go-fuse";
-      rev =  "a533f0a5a633cccc0928c81985b13fa24407a211";
-      sha256 = "0kc2jjjyhnrd934jn7hzfx8kd4z2yq5yblwrxr6xcjjql1vb1n9k";
+      rev =  "161a164844568ebf4bfaa68c90ba3a9f2914dda4";
+      sha256 = "1r0rs76k9zg60i02jlcqxi7m4ivla1xwv3ijwav7pfbyyr1yqhsx";
     };
   }
   {
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/jacobsa/crypto";
-      rev =  "d95898ceee0769dac9bf74c46f8f68d3d3d79100";
-      sha256 = "0dgcvms7if672f09y0cj49n711i9r0609p5f1s27i53yah4qlm19";
+      rev =  "9f44e2d11115452dad8f404f029574422855f46a";
+      sha256 = "18c3cx8izxdajq22zdq0n19j9d2l6iickd3mz39j5h96kw7l5qmy";
     };
   }
   {
@@ -36,13 +36,22 @@
       sha256 = "0c227ly3z8pqaqg22lpd8nzgqrfsbjx5gi9rp9ks1cmd11dv2gl9";
     };
   }
+  {
+    goPackagePath  = "github.com/sabhiram/go-gitignore";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sabhiram/go-gitignore";
+      rev =  "d3107576ba9425fc1c85f4b3569c4631b805a02e";
+      sha256 = "1rdwyxgcsiwgmlqnc3k6h300mzlvjc3j21np4yh1h476wc8dvl0l";
+    };
+  }
   {
     goPackagePath  = "golang.org/x/crypto";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev =  "8dd112bcdc25174059e45e07517d9fc663123347";
-      sha256 = "0gbcz7gxmgg88s28vb90dsp1vdq0har7zvg2adsqbp8bm05x9q6b";
+      rev =  "a1f597ede03a7bef967a422b5b3a5bd08805a01e";
+      sha256 = "0yiczljll72ip2vkxgd6052rhpaba37a68vf6si3v8s8s3g870lc";
     };
   }
   {
diff --git a/pkgs/tools/filesystems/gocryptfs/fix-unix2syscall_darwin.go-build-failure.patch b/pkgs/tools/filesystems/gocryptfs/fix-unix2syscall_darwin.go-build-failure.patch
deleted file mode 100644
index 1adbc2c4d232..000000000000
--- a/pkgs/tools/filesystems/gocryptfs/fix-unix2syscall_darwin.go-build-failure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/internal/syscallcompat/unix2syscall_darwin.go
-+++ b/internal/syscallcompat/unix2syscall_darwin.go
-@@ -19,8 +19,8 @@ func Unix2syscall(u unix.Stat_t) syscall.Stat_t {
- 		Size:      u.Size,
- 		Blksize:   u.Blksize,
- 		Blocks:    u.Blocks,
--		Atimespec: syscall.Timespec(u.Atimespec),
--		Mtimespec: syscall.Timespec(u.Mtimespec),
--		Ctimespec: syscall.Timespec(u.Ctimespec),
-+		Atimespec: syscall.Timespec(u.Atim),
-+		Mtimespec: syscall.Timespec(u.Mtim),
-+		Ctimespec: syscall.Timespec(u.Ctim),
- 	}
- }