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: 4ad424fbd635
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 65d0b082f372
Choose a head ref
  • 6 commits
  • 7 files changed
  • 2 contributors

Commits on Sep 14, 2018

  1. fetchFromGitLab: add a group optional argument 

    For example, paperwork is at https://gitlab.gnome.org/World/OpenPaperwork/paperwork
and you can fetch this repo with group = "World", owner =
"OpenPaperwork", and repo = "paperwork".
    @symphorien
    symphorien committed Sep 14, 2018
    Copy the full SHA
    c3612b9 View commit details
    Browse the repository at this point in the history

  2. paperwork: 1.2.2 -> 1.2.4

    @symphorien
    symphorien committed Sep 14, 2018
    Copy the full SHA
    f403939 View commit details
    Browse the repository at this point in the history

  3. pythonPackages.pyocr: 0.4.7 -> 0.5.3

    @symphorien
    symphorien committed Sep 14, 2018
    Copy the full SHA
    5314a74 View commit details
    Browse the repository at this point in the history

  4. pythonPackages.pypillowfight: 0.2 -> 0.2.4

    @symphorien
    symphorien committed Sep 14, 2018
    Copy the full SHA
    cd599c8 View commit details
    Browse the repository at this point in the history

  5. pythonPackages.{pyocr,pypillowfight}: fix homepage

    @symphorien
    symphorien committed Sep 14, 2018
    Copy the full SHA
    46cd67e View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2018

  1. Merge Paperwork update to version 1.2.4 (#46487) 

    Thanks to @symphorien for this work, which apart from the update itself
includes a few more fixes and cleanups.

I've tested building and running the upgraded Paperwork and while I
haven't done extensive testing on every little feature it seems to work
so far.

The changes also include an addition to fetchFromGitLab, which allows to
specify a group.

Merges: #46487
    @aszlig
    aszlig committed Sep 25, 2018
    Copy the full SHA
    65d0b08 View commit details
    Browse the repository at this point in the history