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: ab06f3e99c78
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: e51a982fec5f
Choose a head ref
  • 8 commits
  • 20 files changed
  • 3 contributors

Commits on Jan 2, 2018

  1. Qt5: 5.9.3 -> 5.10.0

    bkchr committed Jan 2, 2018
    Copy the full SHA
    e5b1a57 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. qt5-qtbase: update darwin patch

    LnL7 committed Jan 9, 2018
    Copy the full SHA
    3793320 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2018

  1. qt5: reduce closure size

    First, closure size is reduced by including the static libraries in $out instead
    of trying to move them to $dev. The Qt build system cannot handle libraries
    being split between different prefixes. Previously, the static libraries were
    moved into $dev and the shared libraries were symlinked from $out to $dev to
    fool the build system. However, this causes $dev to be retained at
    runtime. Instead, we now keep the static libraries in $out. Fortunately, the
    static libraries are not very large anyway.
    
    Second, we build with QT_NO_DEBUG defined unless debugging is enabled. This
    causes some assertions to be removed; when assertions are included, they pull
    paths from $dev into the runtime closure by using the __FILE__ macro. We also
    now patch qtbase to remove even more assertions when QT_NO_DEBUG is defined.
    ttuegel committed Jan 16, 2018
    Copy the full SHA
    75d2a7d View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    617c4f4 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    0423964 View commit details
    Browse the repository at this point in the history
  4. kwidgetsaddons: 5.42.0 -> 5.42.1

    ttuegel committed Jan 16, 2018
    Copy the full SHA
    7e5346c View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    1c004da View commit details
    Browse the repository at this point in the history
  6. Merge branch 'merge/qt-5.10.0'

    Supersedes: #33297
    ttuegel committed Jan 16, 2018
    Copy the full SHA
    e51a982 View commit details
    Browse the repository at this point in the history