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: a98c19fe2ca8
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 288d1d17805f
Choose a head ref
  • 17 commits
  • 24 files changed
  • 13 contributors

Commits on Sep 4, 2017

  1. nixos/xpra: allow to set extra options (#28934) 

    (cherry picked from commit 4521225)
    @offlinehacker @globin
    offlinehacker authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    a1415df View commit details
    Browse the repository at this point in the history

  2. tor-browser: allow to pass TOR_SKIP_LAUNCH 

    (cherry picked from commit ff1b18a)
    @offlinehacker @globin
    offlinehacker authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    4d36f29 View commit details
    Browse the repository at this point in the history

  3. zeal: 0.3.1 -> 0.4.0 

    Also switch to cmake and remove the ads that are now otherwise being loaded.

(cherry picked from commit c4265cd)
    @peterhoeg @globin
    peterhoeg authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    225f26b View commit details
    Browse the repository at this point in the history

  4. mwprocapture: 1.2.0.3269 -> 1.2.0.3589 

    remove linux 4.11 patch as it was included upstream, include
a new patch needed for linux 4.13

(cherry picked from commit deb50bc)
    @globin
    Cray Elliott authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    9c2c4e7 View commit details
    Browse the repository at this point in the history

  5. mwprocapture: fix build with kernels <4.13 

    also do some minor cleanup

(cherry picked from commit 1af75ba)
    @globin
    Cray Elliott authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    a5fa58e View commit details
    Browse the repository at this point in the history

  6. coqPackages: remove duplication in mkCoqPackages 

    (cherry picked from commit ebce795)
    @vbgl @globin
    vbgl authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    ba1645d View commit details
    Browse the repository at this point in the history

  7. allegro: fix sandboxed build with nixUnstable 

    In Nix 1.12 sandboxed builds are performed in /build/ directory which conflicts
with the regex in docs/CMakeLists.txt, and generated documentation ends up in
wrong directory -> https://hydra.nixos.org/build/53914969/nixlog/1 -> CTRL-F
abi.txt

(cherry picked from commit e22a772)
    @pbogdan @globin
    pbogdan authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    7c29204 View commit details
    Browse the repository at this point in the history

  8. xournal: 0.4.8 -> 0.4.8.2016 

    Upstream bug fixes:

  * pen and touchscreen input handling bugfixes
  * fix a minor bug with save file paths in Windows (D. German)
  * use GDK macros (not WIN32) to disable X11-specific code (T.
    Schoonjans)
  * export to PDF and printing: fix resolution loss on some pdf
    backgrounds
  * disable xinput during modal dialog boxes
  * avoid data corruption when exporting to overwrite a PDF
  * fix path search order for toolbar bitmaps
  * text and image tools activate on button release instead of button
    press to avoid subsequent confusion between clicks in toolbar and
    drawing area
  * fix "pen disable touch" when touchscreen sends prox events (A.
    Kittenberger)
  * fix crash when pasting text or images via xclip
  * updated Italian translation (Marco Ciampa)

New upstream features:

  * add space and shift-space bindings to page down/up (D. German)
  * add A5 paper (D. German)
  * config option to export successive layers to separate PDF pages
  * config option to create new file when trying to open non-existent
    .xoj

The full change log along with bug numbers can be found at:

https://sourceforge.net/p/xournal/code/ci/Release-0_4_8_2016/tree/ChangeLog

I've dropped gdk-quartz-backend.patch, because I believe it has been
fixed upstream.

Here are the upstream changes relevant for the patch (shortened, because
SourceForge has really long URLs):

  http://bit.ly/2vXW8n0 -> src/Makefile.am
  http://bit.ly/2gDnjl7 -> src/xo-file.c
  http://bit.ly/2xJ5K7A -> src/xo-misc.c

Tested building and using the application.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @7c6f434c, @dguibert
Cc: @johbo who has introduced the patch in #21842
(cherry picked from commit 8436e9b)
    @aszlig @globin
    aszlig authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    e067351 View commit details
    Browse the repository at this point in the history

  9. pr template: make formatting consistent 

    (cherry picked from commit e221d94)
    @pbogdan @globin
    pbogdan authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    4c587d0 View commit details
    Browse the repository at this point in the history

  10. Update homepage link of Mumble 

    (cherry picked from commit f37f8c4)
    @globin
    Felix Singer authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    5c237e4 View commit details
    Browse the repository at this point in the history

  11. ardour: fix desktop file icon path 

    (cherry picked from commit 1f67b17)
    @zraexy @globin
    zraexy authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    c44d879 View commit details
    Browse the repository at this point in the history

  12. glances: 2.10 -> 2.11 

    (cherry picked from commit d70331c)
    @primeos @globin
    primeos authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    7861d1b View commit details
    Browse the repository at this point in the history

  13. alacritty: 2017-08-28 -> 2017-09-02 

    (cherry picked from commit 0e88752)
    @NeQuissimus @globin
    NeQuissimus authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    d903f48 View commit details
    Browse the repository at this point in the history

  14. tor-browser: allow to pass TOR_CONTROL_PORT and TOR_SOCKS_PORT 

    (cherry picked from commit 0347659)
    @offlinehacker @globin
    offlinehacker authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    1a3596a View commit details
    Browse the repository at this point in the history

  15. dhall: add a static top-level executable for dhall 

    cc @Gabriel439

(cherry picked from commit 11cd027)
    @Profpatsch @globin
    Profpatsch authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    0ad8685 View commit details
    Browse the repository at this point in the history

  16. nexus: 2.12.0-01 -> 3.5.1-02 

    Update Nexus to version 3.5.1-02 and fix startup stript to run in nix
environment.

(cherry picked from commit e783c2b)
    @ironpinguin @globin
    ironpinguin authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    b922f94 View commit details
    Browse the repository at this point in the history

  17. nexus: Add module for nexus. 

    Add also myself as maintainer
Add simple test of the nexus service

(cherry picked from commit 4ea1d49)
    @ironpinguin @globin
    ironpinguin authored and globin committed Sep 4, 2017
    Configuration menu
    Copy the full SHA
    288d1d1 View commit details
    Browse the repository at this point in the history