3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs
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
..
applications Merge pull request #51812 from samueldr/fix/altcoins-and-boost165 2018-12-10 17:35:12 +01:00
build-support Merge staging-next into master 2018-12-08 16:29:21 +01:00
common-updater
data Merge pull request #51763 from pbogdan/add-ant-theme 2018-12-10 22:39:27 +01:00
desktops gnome3.gnome-session: prevent crash when launching wayland sessions 2018-12-10 10:27:00 +01:00
development pythonPackages.protobuf: apply patch for python 3.7 only when building with it 2018-12-11 11:30:52 +01:00
games steam: ran update-runtime.py 2018-12-10 13:50:06 +01:00
misc seafile-shared: 6.2.8 -> 6.2.9 2018-12-10 15:50:29 +01:00
os-specific Merge pull request #51756 from markuskowa/upd-lvm2 2018-12-10 22:02:02 +00:00
servers Merge pull request #51719 from marsam/postgresql-build-icu-support 2018-12-10 01:52:54 +02:00
shells oh-my-zsh: 2018-11-02 -> 2018-11-27 2018-12-10 09:54:19 -05:00
stdenv Merge master into staging-next 2018-12-07 15:22:35 +01:00
test
tools Merge pull request #51756 from markuskowa/upd-lvm2 2018-12-10 22:02:02 +00:00
top-level credstash: add standalone Python application (#51807) 2018-12-11 10:49:27 +01:00