dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

protobuf3: fix parameter naming

Browse Source
This commit is contained in:
ryan4729 2018-10-15 01:57:47 -07:00
parent 3653909bb9
commit 12ededf3d8
6 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/protobuf/3.1.nix
View File

@ -1,8 +1,7 @@
{ callPackage, externalProtoc, buildProtobuf, ... }: { callPackage, useExternalProtoc, buildProtobuf, ... }:
callPackage ./generic-v3.nix { callPackage ./generic-v3.nix {
version = "3.1.0"; version = "3.1.0";
sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i"; sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i";
externalProtoc = externalProtoc; inherit useExternalProtoc buildProtobuf;
buildProtobuf = buildProtobuf;
} }

5
pkgs/development/libraries/protobuf/3.4.nix
View File

@ -1,8 +1,7 @@
{ callPackage, lib, externalProtoc, buildProtobuf, ... }: { callPackage, lib, useExternalProtoc, buildProtobuf, ... }:
lib.overrideDerivation (callPackage ./generic-v3.nix { lib.overrideDerivation (callPackage ./generic-v3.nix {
version = "3.4.1"; version = "3.4.1";
sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb"; sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb";
externalProtoc = externalProtoc; inherit useExternalProtoc buildProtobuf;
buildProtobuf = buildProtobuf;
}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })

5
pkgs/development/libraries/protobuf/3.5.nix
View File

@ -1,8 +1,7 @@
{ callPackage, lib, externalProtoc, buildProtobuf, ... }: { callPackage, lib, useExternalProtoc, buildProtobuf, ... }:
lib.overrideDerivation (callPackage ./generic-v3.nix { lib.overrideDerivation (callPackage ./generic-v3.nix {
version = "3.5.1.1"; version = "3.5.1.1";
sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk"; sha256 = "1h4xydr5j2zg1888ncn8a1jvqq8fgpgckrmjg6lqzy9jpkvqvfdk";
externalProtoc = externalProtoc; inherit useExternalProtoc buildProtobuf;
buildProtobuf = buildProtobuf;
}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; }) }) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })

5
pkgs/development/libraries/protobuf/3.6.nix
View File

@ -1,8 +1,7 @@
{ callPackage, externalProtoc, buildProtobuf, ... }: { callPackage, useExternalProtoc, buildProtobuf, ... }:
callPackage ./generic-v3.nix { callPackage ./generic-v3.nix {
version = "3.6.1"; version = "3.6.1";
sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq"; sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq";
externalProtoc = externalProtoc; inherit useExternalProtoc buildProtobuf;
buildProtobuf = buildProtobuf;
} }

6
pkgs/development/libraries/protobuf/generic-v3.nix
View File

@ -1,7 +1,7 @@
{ stdenv { stdenv
, fetchFromGitHub , fetchFromGitHub
, autoreconfHook, zlib, gmock, which, buildPackages , autoreconfHook, zlib, gmock, which, buildPackages
, externalProtoc , useExternalProtoc
, buildProtobuf ? null , buildProtobuf ? null
, version, sha256 , version, sha256
, ... , ...
@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc ] nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc ]
++ stdenv.lib.optional externalProtoc [ buildProtobuf ]; ++ stdenv.lib.optional useExternalProtoc [ buildProtobuf ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];
configureFlags = stdenv.lib.optional externalProtoc [ "--with-protoc=${buildProtobuf}/bin/protoc" ]; configureFlags = stdenv.lib.optional useExternalProtoc [ "--with-protoc=${buildProtobuf}/bin/protoc" ];
enableParallelBuilding = true; enableParallelBuilding = true;

8
pkgs/top-level/all-packages.nix
View File

@ -11727,25 +11727,25 @@ with pkgs;
protobuf = protobuf3_6; protobuf = protobuf3_6;
protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix {
externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
then buildPackages.protobuf3_6 then buildPackages.protobuf3_6
else null; else null;
}; };
protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix {
externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
then buildPackages.protobuf3_5 then buildPackages.protobuf3_5
else null; else null;
}; };
protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix {
externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
then buildPackages.protobuf3_4 then buildPackages.protobuf3_4
else null; else null;
}; };
protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix {
externalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform); useExternalProtoc = (stdenv.hostPlatform != stdenv.buildPlatform);
buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform) buildProtobuf = if (stdenv.hostPlatform != stdenv.buildPlatform)
then buildPackages.protobuf3_1 then buildPackages.protobuf3_1
else null; else null;