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: 165c116a329e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 67f6f3a42025
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 30, 2017

  1. pandas: Fix build on darwin 

    Since the commands "locale", "pbpaste" and "pbcopy" are not in nixpkgs,
as they are impure darwin dependencies, we currently cannot get the
clipboard and locale functionality to work properly. We disable the
tests "test_locale" and "test_clipboard" on darwin, so we get a mostly
working pandas. Additionally to disabling the test via py.test, we also
need to provide fake pbpaste/pbcopy commands, so py.test won't fail
during the collection phase.

This closes #25417 and closes #11623.
    @knedlsepp
    knedlsepp committed May 30, 2017
    Configuration menu
    Copy the full SHA
    eb2994a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #26221 from knedlsepp/fix-pandas-darwin-build 

    pandas: Fix build on darwin
    @FRidh
    FRidh committed May 30, 2017
    Configuration menu
    Copy the full SHA
    67f6f3a View commit details
    Browse the repository at this point in the history