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
base: 39626dcc2ac2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: a48adb351116
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 19, 2020

  1. pythonPackages.psutil: fix fix for darwin build 

    PR #82524 correctly diagnosed the problem, but slightly fluffed the boolean
logic (disable tests for Darwin as well as non-x86_64 arch).
    @simonchatts
    simonchatts committed Jun 19, 2020
    Copy the full SHA
    73f7453 View commit details
    Browse the repository at this point in the history

  2. python: aiohttp: fix darwin build 

    Disable a non-critical test known to fail on Darwin (see aio-libs/aiohttp#3572)
    @simonchatts
    simonchatts committed Jun 19, 2020
    Copy the full SHA
    5a35461 View commit details
    Browse the repository at this point in the history

  3. python: uvloop: fix darwin build 

    Skip tests that fail on Darwin
    @simonchatts
    simonchatts committed Jun 19, 2020
    Copy the full SHA
    084d3da View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2020

  1. Merge pull request #91118 from simonchatts/darwin-fixes 

    python: aiohttp/psutil/uvloop Darwin fixes
    @FRidh
    FRidh committed Jun 20, 2020
    Copy the full SHA
    a48adb3 View commit details
    Browse the repository at this point in the history