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: 4012f58e4378
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: cdc714fe4a0f
Choose a head ref
  • 4 commits
  • 7 files changed
  • 3 contributors

Commits on Mar 13, 2019

  1. pythonPackages.thumbor: 6.6.0 -> 6.7.0 

    This patch ensures that the currently broken `thumbor`[1] package builds
and works again.

The following problems were fixed:

* Rather than placing required packages (like `gifsicle` or `exiftool`)
  into the build input list, we reference them explicitly where needed
  to ensure that the package works after the build without further
  installs.

* Skip the `test_redeye_applied` test case which is broken for a while
  now.

[1] https://hydra.nixos.org/build/90290998

(cherry picked from commit 8dac864)
    @Ma27
    Ma27 authored and Robert Schütz committed Mar 13, 2019
    Copy the full SHA
    ab89b6b View commit details
    Browse the repository at this point in the history

  2. pythonPackages.cairocffi: support 1.0 and 0.9 

    This patch ensures that Python2 can be used if cairocffi is used.
Version 1.0 dropped Python 2 support.

(cherry picked from commit e878fd6)
    @avnik
    avnik authored and Robert Schütz committed Mar 13, 2019
    Copy the full SHA
    5681820 View commit details
    Browse the repository at this point in the history

  3. python3.pkgs.cairosvg: 2.2.1 -> 2.3.0 

    (cherry picked from commit 01cb9b0)
    Robert Schütz committed Mar 13, 2019
    Copy the full SHA
    3274b1d View commit details
    Browse the repository at this point in the history

  4. python.pkgs.cairosvg1: remove 

    Make python2.pkgs.cairosvg refer to what previously was cairosvg1 instead.

(cherry picked from commit f721655)
    Robert Schütz committed Mar 13, 2019
    Copy the full SHA
    cdc714f View commit details
    Browse the repository at this point in the history