summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/libraries/protobufc/1.3.nix11
-rw-r--r--pkgs/development/libraries/protobufc/default.nix (renamed from pkgs/development/libraries/protobufc/generic.nix)16
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 12 insertions, 17 deletions
diff --git a/pkgs/development/libraries/protobufc/1.3.nix b/pkgs/development/libraries/protobufc/1.3.nix
deleted file mode 100644
index 82126727282..00000000000
--- a/pkgs/development/libraries/protobufc/1.3.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ callPackage, fetchFromGitHub, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "1.3.3";
-  src = fetchFromGitHub {
-    owner = "protobuf-c";
-    repo = "protobuf-c";
-    rev = "v${version}";
-    sha256 = "13948amsjj9xpa4yl6amlyk3ksr96bbd4ngshh2yzflwcslhg6gv";
-  };
-})
diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/default.nix
index b64d75076ba..28c15f0ef45 100644
--- a/pkgs/development/libraries/protobufc/generic.nix
+++ b/pkgs/development/libraries/protobufc/default.nix
@@ -1,15 +1,20 @@
-{ lib, stdenv, src, version
+{ lib, stdenv, fetchFromGitHub
 , autoreconfHook, pkg-config, protobuf, zlib
-, ...
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "protobuf-c";
-  inherit version;
+  version = "1.4.1";
 
-  inherit src;
+  src = fetchFromGitHub {
+    owner = "protobuf-c";
+    repo = "protobuf-c";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-TJCLzxozuZ8ynrBQ2lKyk03N+QA/lbOwywUjDUdTlbM=";
+  };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];
+
   buildInputs = [ protobuf zlib ];
 
   meta = with lib; {
@@ -17,5 +22,6 @@ stdenv.mkDerivation {
     description = "C bindings for Google's Protocol Buffers";
     license = licenses.bsd2;
     platforms = platforms.all;
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78c8b3cb65d..7b51a1a1858 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21165,7 +21165,7 @@ with pkgs;
   protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { };
   protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { };
 
-  protobufc = callPackage ../development/libraries/protobufc/1.3.nix { };
+  protobufc = callPackage ../development/libraries/protobufc { };
 
   protolock = callPackage ../development/libraries/protolock { };