From 121a926167936ec1365151e55bb547afef6180d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 19 Dec 2011 16:03:55 +0000
Subject: [PATCH] Updating Google Protocol Buffers, and removing an old version
 because I think it is unreferenced.

svn path=/nixpkgs/trunk/; revision=30969
---
 pkgs/development/libraries/protobuf/2.2.0.nix | 28 -------------------
 .../libraries/protobuf/default.nix            |  4 +--
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/libraries/protobuf/2.2.0.nix

diff --git a/pkgs/development/libraries/protobuf/2.2.0.nix b/pkgs/development/libraries/protobuf/2.2.0.nix
deleted file mode 100644
index c9419367fd6e..000000000000
--- a/pkgs/development/libraries/protobuf/2.2.0.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ fetchurl, stdenv, zlib }:
-
-stdenv.mkDerivation rec {
-  name = "protobuf-2.2.0";
-
-  src = fetchurl {
-    url = "http://protobuf.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "0jvj7i0fifl4fqjf84f67chb9b6q2z1jqkfc1zic9fz035mzn7bk";
-  };
-
-  buildInputs = [ zlib ];
-
-  doCheck = true;
-
-  meta = {
-    description = "Protocol Buffers - Google's data interchange format";
-
-    longDescription =
-      '' Protocol Buffers are a way of encoding structured data in an
-         efficient yet extensible format.  Google uses Protocol Buffers for
-         almost all of its internal RPC protocols and file formats.
-      '';
-
-    license = "mBSD";
-
-    homepage = http://code.google.com/p/protobuf/;
-  };
-}
diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix
index 05dabd23773f..57dc58bdfa17 100644
--- a/pkgs/development/libraries/protobuf/default.nix
+++ b/pkgs/development/libraries/protobuf/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "protobuf-2.3.0";
+  name = "protobuf-2.4.1";
 
   src = fetchurl {
     url = "http://protobuf.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "1b40cb7ij4bnw78k46y0a2jkm8qisxkk1gbbj40yi77yqc3pf33n";
+    sha256 = "1gxhfhk37jyjq1z4y3d4bz4i1fk2an5ydhk5kjzlp0rhfcs5516g";
   };
 
   buildInputs = [ zlib ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e9f9fa68b96..caa473e32254 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4426,7 +4426,6 @@ let
   postgis = callPackage ../development/libraries/postgis { };
 
   protobuf = callPackage ../development/libraries/protobuf { };
-  protobuf_2_2_0 = callPackage ../development/libraries/protobuf/2.2.0.nix { };
 
   pth = callPackage ../development/libraries/pth { };