1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-15 09:03:48 +00:00
Commit graph

9 commits

Author SHA1 Message Date
Robert Schütz 905cdeecac python.pkgs.protobuf: use python.interpreter 2019-04-14 13:21:10 +02:00
Florian Franzen d1feec73e4 protobuf3_6: 3.6.1 -> 3.6.1.3 2019-04-14 13:19:38 +02:00
Pierre Bourdon f20a66084f 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 5c7531872f
2019-03-03 08:07:56 +01:00
Frederik Rietdijk 5c7531872f python.pkgs.protobuf: fix build 2019-02-17 14:40:52 +01:00
Samuel Dionne-Riel f9b16e60da pythonPackages.protobuf: apply patch for python 3.7 only when building with it
Change introduced in #50672.

The patch does not apply on older protobuf like protobuf3_1

```
$ nix-build -E 'with import ./. { }; python3Packages.protobuf.override { protobuf = protobuf3_1; }'
unpacking sources
unpacking source archive /nix/store/1zdyl0cxaa8ha2v1zp75zzdjd6j99d0m-source
source root is source
setting SOURCE_DATE_EPOCH to timestamp 315619200 of file source/util/python/BUILD
patching sources
applying patch /nix/store/yagx7hvylnnjq7lxbcia0y5lq1r736w3-0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch
patching file google/protobuf/pyext/descriptor.cc
Hunk #1 succeeded at 55 (offset -1 lines).
patching file google/protobuf/pyext/descriptor_containers.cc
patching file google/protobuf/pyext/descriptor_pool.cc
Hunk #1 succeeded at 47 (offset -1 lines).
patching file google/protobuf/pyext/extension_dict.cc
Hunk #1 FAILED at 53.
1 out of 1 hunk FAILED -- saving rejects to file google/protobuf/pyext/extension_dict.cc.rej
patching file google/protobuf/pyext/message.cc
Hunk #1 succeeded at 82 (offset 3 lines).
Hunk #2 succeeded at 1425 (offset -104 lines).
```

Since the patch isn't necessary on python versions older than 3.7, let's
only apply it for version 3.7. This means that most things using older
protobuf implementation will now be able to build when using an older
pythonPackage set (as is most probably the case anyway).

This still leaves protobuf 3.1 using packages hanging, but the errors
will be localized to those that would be breaking anyway with the
upgrade to 3.7 as default python.
2018-12-11 11:30:52 +01:00
Ben Wolsieffer be8569be49 pythonPackages.protobuf: fix compatibility with Python 3.7 2018-11-27 12:02:55 -05:00
Daiderd Jordan 8bef91d84a
protobuf: fix missing google.protobuf.compiler 2018-08-17 01:36:41 +02:00
adisbladis d99378654f pythonPackages: Add version and pname attributes to packages 2017-11-23 17:49:43 +01:00
Frederik Rietdijk 07eeeb3600 Python: move expressions in python-modules to their own folders 2017-11-05 10:45:54 +01:00