From 96fd899fea7540afd681125f307416618ac9a0de Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 12 Jan 2015 03:24:41 -0500
Subject: [PATCH] capnproto: update to 0.5.0

---
 pkgs/development/libraries/capnproto/default.nix | 15 ++++++++-------
 pkgs/top-level/python-packages.nix               |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix
index 8a067f148d9..c6bd7e4f4d4 100644
--- a/pkgs/development/libraries/capnproto/default.nix
+++ b/pkgs/development/libraries/capnproto/default.nix
@@ -1,7 +1,13 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "capnproto-0.4.1";
+stdenv.mkDerivation rec {
+  name = "capnproto-${version}";
+  version = "0.5.0";
+
+  src = fetchurl {
+    url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
+    sha256 = "01fsf60zlyc6rlhnrh8gd9jj5gs52ancb50ml3w7gwq55zgx2rf7";
+  };
 
   meta = with stdenv.lib; {
     homepage    = "http://kentonv.github.io/capnproto";
@@ -15,9 +21,4 @@ stdenv.mkDerivation {
     platforms   = platforms.all;
     maintainers = with maintainers; [ cstrahan ];
   };
-
-  src = fetchurl {
-    url = "https://capnproto.org/capnproto-c++-0.4.1.tar.gz";
-    sha256 = "8453e8d508906062f113dbdfff552f41e08083ccf7c9407778a8d107675cd468";
-  };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 357aa8d7383..47160cb6be1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7440,19 +7440,19 @@ let
 
 
   pycapnp = buildPythonPackage rec {
-    name = "pycapnp-0.4.4";
+    name = "pycapnp-0.5.1";
     disabled = isPyPy || isPy3k;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pycapnp/${name}.tar.gz";
-      sha256 = "33b2b79438bb9bf37097966e1c90403c34ab49be1eb647ee251b62f362ee3537";
+      sha256 = "1kp97il34419gcrhn866n6a10lvh8qr13bnllnnh9473n4cq0cvk";
     };
 
     buildInputs = with pkgs; [ capnproto self.cython ];
 
     # import setuptools as soon as possible, to minimize monkeypatching mayhem.
     postConfigure = ''
-      sed -i '2iimport setuptools' setup.py
+      sed -i '3iimport setuptools' setup.py
     '';
 
     meta = with stdenv.lib; {