Comparing changes
Open a pull request
base repository: NixOS/nixpkgs-channels
base: 1a69b3303f3a
head repository: NixOS/nixpkgs-channels
compare: c89cbdcd48bf
- 17 commits
- 14 files changed
- 10 contributors
Commits on Dec 11, 2018
-
pythonPackages.protobuf: apply patch for python 3.7 only when buildin…
…g 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.
-
caffe2: Use python36Packages explicitly.
Fallout from 0f38d96
-
-
-
-
Merge pull request #51300 from tilpner/minio-update
minio/minio-client: update
-
Merge pull request #51809 from samueldr/fix/caffe2-python36
[WIP] caffe2: Use python36Packages explicitly.
-
-
-
-
Merge pull request #51867 from couchemar/hub-2.6.1
gitAndTools.hub: 2.6.0 -> 2.6.1
-
Merge pull request #51731 from marsam/update-python-robotframework-se…
…lenium2library pythonPackages.robotframework-selenium2library: 1.6.0 -> 3.0.0
-
Robert Schütz committed
Dec 11, 2018 -
-
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 1a69b3303f3a...c89cbdcd48bf