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: 57004738b168
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 11590f452660
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 15, 2019

  1. scribusUnstable: 2018-10-13 -> 2019-01-14

    @erictapen
    erictapen committed Jan 15, 2019
    Copy the full SHA
    3f0fbc0 View commit details
    Browse the repository at this point in the history

  2. scribusUnstable: fix build failure from poppler bump 

    Poppler was upgraded in [0] and therefore the build broke, as
poppler/goo/gtypes.h was moved into poppler/goo/gfile.h [1].

The patch is intended to be broght upstream and then can be reverted.

[0] 7757e43
[1] https://gitlab.freedesktop.org/poppler/poppler/commit/ef3ef702bc3dc845731e43215400448c5324efd4
    @erictapen
    erictapen committed Jan 15, 2019
    Copy the full SHA
    ac891e9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #53958 from erictapen/scribusUnstable-poppler-fix 

    scribusUnstable: fix build failure from poppler bump
    @dtzWill
    dtzWill committed Jan 15, 2019
    Copy the full SHA
    11590f4 View commit details
    Browse the repository at this point in the history