diff --git a/pkgs/development/libraries/protobuf/3.6.nix b/pkgs/development/libraries/protobuf/3.6.nix index 0009209d9ce..16decc44e84 100644 --- a/pkgs/development/libraries/protobuf/3.6.nix +++ b/pkgs/development/libraries/protobuf/3.6.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.6.1"; - sha256 = "1bg40miylzpy2wgbd7l7zjgmk43l12q38fq0zkn0vzy1lsj457sq"; + version = "3.6.1.3"; + sha256 = "1spj0d4flx6h3phxx3sg9r00yv734hina3365avkcz9brnm089c1"; } diff --git a/pkgs/development/libraries/protobuf/3.7.nix b/pkgs/development/libraries/protobuf/3.7.nix new file mode 100644 index 00000000000..8a3f9a56321 --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.7.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.7.0"; + sha256 = "0nlxif4cajqllsj2vdh7zp14ag48fb8lsa64zmq8625q9m2lcmdh"; +} diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 4f00537db0c..69dce2723eb 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { nativeBuildInputs = [ google_apputils pyext ]; buildInputs = [ protobuf ]; - patches = optional isPy37 - # Python 3.7 compatibility (remove when protobuf 3.7 is released) + patches = optional (isPy37 && (versionOlder protobuf.version "3.6.1.2")) + # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2) (fetchpatch { url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch"; sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1"; @@ -41,9 +41,9 @@ buildPythonPackage rec { preBuild = '' # Workaround for https://github.com/google/protobuf/issues/2895 - ${python}/bin/${python.executable} setup.py build + ${python.interpreter} setup.py build '' + optionalString (versionAtLeast protobuf.version "2.6.0") '' - ${python}/bin/${python.executable} setup.py build_ext --cpp_implementation + ${python.interpreter} setup.py build_ext --cpp_implementation ''; installFlags = optional (versionAtLeast protobuf.version "2.6.0") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71362e2e1a2..2ff5a02d631 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12298,8 +12298,9 @@ in buildPythonApplication click future six; }; - protobuf = protobuf3_6; + protobuf = protobuf3_7; + protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { }; protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; protobuf3_5 = callPackage ../development/libraries/protobuf/3.5.nix { }; protobuf3_4 = callPackage ../development/libraries/protobuf/3.4.nix { };