Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1a69b3303f3a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c89cbdcd48bf
Choose a head ref
  • 17 commits
  • 14 files changed
  • 10 contributors

Commits on Dec 11, 2018

  1. 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.
    @samueldr
    samueldr authored and Robert Schütz committed Dec 11, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    rickie Rick Ossendrijver
    GPG key ID: A2237828CE7F76B2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f9b16e6 View commit details

  2. caffe2: Use python36Packages explicitly. 

    Fallout from 0f38d96
    @samueldr
    samueldr authored and Robert Schütz committed Dec 11, 2018
    Copy the full SHA
    3129811 View commit details

  3. gitAndTools.hub: 2.6.0 -> 2.6.1

    @couchemar
    couchemar committed Dec 11, 2018
    Copy the full SHA
    6153dc7 View commit details

  4. minio: 2018-07-31T02-11-47Z -> 2018-12-06T01-27-43Z

    @tilpner
    tilpner committed Dec 11, 2018
    Copy the full SHA
    d08187e View commit details

  5. minio-client: 2018-07-31T02-28-53Z -> 2018-12-05T22-59-07Z

    @tilpner
    tilpner committed Dec 11, 2018
    Copy the full SHA
    380fce5 View commit details

  6. Merge pull request #51300 from tilpner/minio-update 

    minio/minio-client: update
    @srhb
    srhb authored Dec 11, 2018
    Copy the full SHA
    84bf8f3 View commit details

  7. Merge pull request #51809 from samueldr/fix/caffe2-python36 

    [WIP] caffe2: Use python36Packages explicitly.
    @dotlambda
    dotlambda authored Dec 11, 2018
    Copy the full SHA
    4a6367e View commit details

  8. pythonPackages.robotstatuschecker: init at 1.3

    @marsam
    marsam committed Dec 11, 2018
    Copy the full SHA
    f52cb0a View commit details

  9. pythonPackages.approvaltests: init at 0.2.4

    @marsam
    marsam committed Dec 11, 2018
    Copy the full SHA
    e3a0c05 View commit details

  10. pythonPackages.mockito: init at 1.1.1

    @marsam
    marsam committed Dec 11, 2018
    Copy the full SHA
    0890aa4 View commit details

  11. pythonPackages.robotframework-seleniumlibrary: init at 3.2.0

    @marsam
    marsam committed Dec 11, 2018
    Copy the full SHA
    850b259 View commit details

  12. pythonPackages.robotframework-selenium2library: 1.6.0 -> 3.0.0

    @marsam
    marsam committed Dec 11, 2018
    Copy the full SHA
    cf46e28 View commit details

  13. Merge pull request #51867 from couchemar/hub-2.6.1 

    gitAndTools.hub: 2.6.0 -> 2.6.1
    @worldofpeace
    worldofpeace authored Dec 11, 2018
    Copy the full SHA
    1aa709b View commit details

  14. Merge pull request #51731 from marsam/update-python-robotframework-se… 

    …lenium2library

pythonPackages.robotframework-selenium2library: 1.6.0 -> 3.0.0
    @dotlambda
    dotlambda authored Dec 11, 2018
    Copy the full SHA
    3c71836 View commit details

  15. ghostwriter: 1.7.3 -> 1.7.4

    Robert Schütz committed Dec 11, 2018
    Copy the full SHA
    da92eb2 View commit details

  16. grafana: 5.4.0 -> 5.4.1

    @WilliButz @globin
    WilliButz authored and globin committed Dec 11, 2018
    Copy the full SHA
    174800f View commit details

  17. linux: 4.20-rc5 -> 4.20-rc6

    @NeQuissimus
    NeQuissimus committed Dec 11, 2018
    Copy the full SHA
    c89cbdc View commit details
Loading