From b851e970daee1cd4a6b6977c9f67ed16cefc1229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 18 Sep 2014 13:12:01 +0200 Subject: [PATCH] Revert "protobuf: 2.5.0 -> 2.6.0" This reverts commit 5dff5ede0a4cd2aa74934588ac06c56e78a9acfb. --- .../libraries/protobuf/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix index 874c58c6bf6..bba8481780a 100644 --- a/pkgs/development/libraries/protobuf/default.nix +++ b/pkgs/development/libraries/protobuf/default.nix @@ -1,28 +1,28 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, zlib }: +{ fetchurl, stdenv, zlib }: stdenv.mkDerivation rec { - name = "protobuf-${version}"; - version = "2.6.0"; + name = "protobuf-2.5.0"; - src = fetchFromGitHub { - owner = "google"; - repo = "protobuf"; - rev = "v${version}"; - sha256 = "020a59x9kbrbhh207j62gw55pj7p5rvz01i6ml6xhpcghp7l50b4"; + src = fetchurl { + url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; + sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; }; - buildInputs = [ autoreconfHook zlib ]; + buildInputs = [ zlib ]; - meta = with stdenv.lib; { - homepage = http://code.google.com/p/protobuf/; + 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 = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; + + license = "mBSD"; + + homepage = http://code.google.com/p/protobuf/; }; }