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

Commits on Nov 6, 2019

  1. sage: ignore cmp deprecation in sagenb

    @timokau
    timokau committed Nov 6, 2019
    Copy the full SHA
    af48079 View commit details
    Browse the repository at this point in the history

  2. sage: ignore deprecation warnings in rst2sws 

    Needs to be fixed upstream (by werkzeug, twisted). Doesn't impact the
functionality and the tests are soon to be removed with the py3 update
anyway.
    @timokau
    timokau committed Nov 6, 2019
    Copy the full SHA
    f85ce83 View commit details
    Browse the repository at this point in the history

  3. sage: ignore werkzeug immutable dict deprecation

    @timokau
    timokau committed Nov 6, 2019
    Copy the full SHA
    da7ec1c View commit details
    Browse the repository at this point in the history

  4. sage: fix pkgconfig errors in tests 

    python.pkgs.pkgconfig raises an exception on missing packages since
version 1.5.0. Previously those errors were just silently ignored. That
worked fine, since the packages are only missing at runtime (when they
are not really needed) but present at buildtime.

Since this fails the tests now, we just add the packages to
PKG_CONFIG_PATH at runtime. This does not add additional runtime
dependencies. Still, it would be nicer if the sage testssuite would not
test the buildsystem at runtime in the first place.

The breakage was originally caused by the pkgconfig update in
1efa716.
    @timokau
    timokau committed Nov 6, 2019
    Copy the full SHA
    f64885b View commit details
    Browse the repository at this point in the history

  5. sage: backport fix for threejs r109

    @timokau
    timokau committed Nov 6, 2019
    Copy the full SHA
    afb9887 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #72771 from timokau/sage-fixes 

    sage: fix tests
    @timokau
    timokau committed Nov 6, 2019
    Copy the full SHA
    c54848e View commit details
    Browse the repository at this point in the history