From 9f0a6d6d7f0bf139b8d208be587f3be60d863dfc Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 6 Feb 2015 12:28:33 -0800
Subject: [PATCH] protobufc: Add version 1.1.0 as the default

---
 pkgs/development/libraries/protobufc/1.0.nix        | 11 +++++++++++
 pkgs/development/libraries/protobufc/1.1.nix        | 11 +++++++++++
 .../protobufc/{default.nix => generic.nix}          | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  4 +++-
 4 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/libraries/protobufc/1.0.nix
 create mode 100644 pkgs/development/libraries/protobufc/1.1.nix
 rename pkgs/development/libraries/protobufc/{default.nix => generic.nix} (59%)

diff --git a/pkgs/development/libraries/protobufc/1.0.nix b/pkgs/development/libraries/protobufc/1.0.nix
new file mode 100644
index 00000000000..d64ea5790c6
--- /dev/null
+++ b/pkgs/development/libraries/protobufc/1.0.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchFromGitHub, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.0.2";
+  src = fetchFromGitHub {
+    owner = "protobuf-c";
+    repo = "protobuf-c";
+    rev = "v${version}";
+    sha256 = "1harabw7qdgcmh098664xkcv8bkyach6i35sisc40yhvagr3fzsz";
+  };
+})
diff --git a/pkgs/development/libraries/protobufc/1.1.nix b/pkgs/development/libraries/protobufc/1.1.nix
new file mode 100644
index 00000000000..228225b721d
--- /dev/null
+++ b/pkgs/development/libraries/protobufc/1.1.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchFromGitHub, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.1.0";
+  src = fetchFromGitHub {
+    owner = "protobuf-c";
+    repo = "protobuf-c";
+    rev = "v${version}";
+    sha256 = "11j9vg55a732v14cki4721ipr942c4krr562gliqmnlwvyz0hlyb";
+  };
+})
diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/generic.nix
similarity index 59%
rename from pkgs/development/libraries/protobufc/default.nix
rename to pkgs/development/libraries/protobufc/generic.nix
index 4d2c1d4349f..3a03d5c8b4b 100644
--- a/pkgs/development/libraries/protobufc/default.nix
+++ b/pkgs/development/libraries/protobufc/generic.nix
@@ -1,15 +1,12 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, protobuf, zlib }:
+{ stdenv, src, version
+, autoreconfHook, pkgconfig, protobuf, zlib
+, ...
+}:
 
 stdenv.mkDerivation rec {
   name = "protobuf-c-${version}";
-  version = "1.0.2";
 
-  src = fetchFromGitHub {
-    owner = "protobuf-c";
-    repo = "protobuf-c";
-    rev = "v${version}";
-    sha256 = "1harabw7qdgcmh098664xkcv8bkyach6i35sisc40yhvagr3fzsz";
-  };
+  inherit src;
 
   buildInputs = [ autoreconfHook pkgconfig protobuf zlib ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fde2b6ff90..7f5f45233e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6967,7 +6967,9 @@ let
   protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { };
   protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
 
-  protobufc = callPackage ../development/libraries/protobufc { };
+  protobufc = protobufc1_1;
+  protobufc1_1 = callPackage ../development/libraries/protobufc/1.1.nix { };
+  protobufc1_0 = callPackage ../development/libraries/protobufc/1.0.nix { };
 
   pth = callPackage ../development/libraries/pth { };