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: 8a93d258cd89
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5eb4258a9a1c
Choose a head ref
  • 6 commits
  • 6 files changed
  • 1 contributor

Commits on Sep 14, 2018

  1. pythonPackages.daphne: 2.1.0 -> 2.2.2 

    Update, re-enable all tests on linux, disable tests on darwin.
This fixes the build of pythonPackages.channels

(cherry picked from commit abe97e9)
    @xeji
    xeji committed Sep 14, 2018
    Copy the full SHA
    c2bb2fb View commit details
    Browse the repository at this point in the history

  2. pythonPackages.eve: fix build, drop incorrect dependencies 

    Build failed because of dependency Flask-PyMongo, which actually
isn't a dependency of eve as they have their own flask_pymongo code.

- Drop incorrect dependency flask-pymongo
- Drop redunant dependencies already propageted by flask:
  itsdangerous, werkzeug, jinja2
- Drop dependency markupsafe, not required any more

(cherry picked from commit 9e4b0b7)
    @xeji
    xeji committed Sep 14, 2018
    Copy the full SHA
    25f3b47 View commit details
    Browse the repository at this point in the history

  3. pythonPackages.flask-pymongo: fix build 

    add missing dependency: vcversioner

(cherry picked from commit 781eaa1)
    @xeji
    xeji committed Sep 14, 2018
    Copy the full SHA
    6678bad View commit details
    Browse the repository at this point in the history

  4. pythonPackages.pytest-rerunfailures: fix build 

    some tests fail since pytest 3.7.2 -> 3.7.4 update, disable them

(cherry picked from commit 0bda601)
    @xeji
    xeji committed Sep 14, 2018
    Copy the full SHA
    837e7c6 View commit details
    Browse the repository at this point in the history

  5. pythonPackages.wordfreq: 2.0 -> 2.2.0, fix build 

    Previous version didn't build (test failure).
Update to latest, tests use pytest now, disable failing tests.

(cherry picked from commit be12bb8)
    @xeji
    xeji committed Sep 14, 2018
    Copy the full SHA
    297a082 View commit details
    Browse the repository at this point in the history

  6. pythonPackages.nilearn: fix tests 

    disable failing tests

(cherry picked from commit d9bdd64)
    @xeji
    xeji committed Sep 14, 2018
    Copy the full SHA
    5eb4258 View commit details
    Browse the repository at this point in the history