Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cf81d36fc979
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f92763c6d15b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 3, 2019

  1. pythonPackages.protobuf: propagate native pkgs.protobuf input 

    Python packages depending on the protobuf library often use the "protoc"
tool from pkgs.protobuf to codegen at build time.

This fixes a few regressions from 5c75318

(cherry picked from commit f20a660)
    @delroth @FRidh
    delroth authored and FRidh committed Mar 3, 2019
    Copy the full SHA
    f92763c View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/python-modules/protobuf/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/protobuf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,8 @@ buildPythonPackage rec {
++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98";

propagatedBuildInputs = [ google_apputils ];
nativeBuildInputs = [ google_apputils pyext protobuf ];
propagatedNativeBuildInputs = [ protobuf ]; # For protoc.
nativeBuildInputs = [ google_apputils pyext ];
buildInputs = [ protobuf ];

patches = optional isPy37