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: 037c15654a08
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d61543ad0ac4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 6, 2019

  1. pythonPackages.cartopy: fix tests for py2.7 by supplying them with xvfb

    python 2.7's tk is over-eager in trying to open an x display,
    so run it in xvfb. xvfb is quite a heavy dependency (albeit only
    a build-time one), so ensure this is only used when needed.
    risicle committed May 6, 2019
    Copy the full SHA
    cb0028b View commit details
    Browse the repository at this point in the history

Commits on May 7, 2019

  1. Merge pull request #60948 from risicle/ris-cartopy-fix

    pythonPackages.cartopy: fix tests for python2.7 using xvfb
    worldofpeace committed May 7, 2019
    Copy the full SHA
    d61543a View commit details
    Browse the repository at this point in the history