From 65d06f33cc0a26030f716a5591be8f56f5fabe84 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Wed, 3 May 2017 02:07:52 -0400
Subject: [PATCH] capnproto: 0.5.3 -> 0.6.0

---
 .../libraries/capnproto/clang4.patch          | 22 -------------------
 .../libraries/capnproto/default.nix           |  9 ++------
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/libraries/capnproto/clang4.patch

diff --git a/pkgs/development/libraries/capnproto/clang4.patch b/pkgs/development/libraries/capnproto/clang4.patch
deleted file mode 100644
index e83abe9f433..00000000000
--- a/pkgs/development/libraries/capnproto/clang4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0f1fd1938b19dccdb5dbfe9cb5177c4342a2a5b5 Mon Sep 17 00:00:00 2001
-From: Eric Fiselier <eric@efcs.ca>
-Date: Thu, 29 Dec 2016 14:23:40 -0700
-Subject: [PATCH] Fix conversion build error when building with Clang 4.0
-
----
- c++/src/capnp/layout.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/c++/src/capnp/layout.h b/c++/src/capnp/layout.h
-index 850925a..b955f08 100644
---- a/src/capnp/layout.h
-+++ b/src/capnp/layout.h
-@@ -126,7 +126,7 @@template <> struct ElementSizeForType<Void> { static constexpr ElementSize value
- template <> struct ElementSizeForType<bool> { static constexpr ElementSize value = ElementSize::BIT; };
- 
- // Lists and blobs are pointers, not structs.
--template <typename T, bool b> struct ElementSizeForType<List<T, b>> {
-+template <typename T, Kind K> struct ElementSizeForType<List<T, K>> {
-   static constexpr ElementSize value = ElementSize::POINTER;
- };
- template <> struct ElementSizeForType<Text> {
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index 0a5df88efdb..fd2271844ac 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -2,18 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "capnproto-${version}";
-  version = "0.5.3";
+  version = "0.6.0";
 
   src = fetchurl {
     url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
-    sha256 = "1yvaadhgakskqq5wpv53hd6fc3pp17mrdldw4i5cvgck4iwprcfd";
+    sha256 = "0gpp1cxsb9nfd7qkjjykzknx03y0z0n4bq5q0fmxci7w38ci22g5";
   };
 
-  patches = [
-    # Remove once they release a version above 0.5.3. See https://github.com/sandstorm-io/capnproto/issues/433
-    ./clang4.patch
-  ];
-
   meta = with stdenv.lib; {
     homepage    = "http://kentonv.github.io/capnproto";
     description = "Cap'n Proto cerealization protocol";