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: 94efde511918
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 094d08813576
Choose a head ref
  • 16 commits
  • 106 files changed
  • 2 contributors

Commits on Nov 2, 2017

  1. Revert "Merge pull request #30255 from bkchr/qt_5_9_2" 

    This reverts commit 4cf0b6b, reversing
changes made to 756b9c7.

Qt 5.9.2 is reverted to Qt 5.9.1, as recommended by KDE upstream due to
https://bugreports.qt.io/browse/QTBUG-64017
    @ttuegel
    ttuegel committed Nov 2, 2017
    Configuration menu
    Copy the full SHA
    4866f16 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2017

  1. qt5: factor out common definitions and remove symlink farm 

    The module definitions are factored out and shared between qt56 and qt59. The
symlink farm which was created during builds is no longer needed.
    @ttuegel
    ttuegel committed Nov 7, 2017
    2 Configuration menu
    Copy the full SHA
    fe0ab94 View commit details
    Browse the repository at this point in the history

  2. kdenlive: missing dependencies

    @ttuegel
    ttuegel committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    1f5b6a2 View commit details
    Browse the repository at this point in the history

  3. lyx: remove obsolete pkg-config hack

    @ttuegel
    ttuegel committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    d13bfc0 View commit details
    Browse the repository at this point in the history

  4. qbittorrent: no longer need to set QT_QMAKE

    @ttuegel
    ttuegel committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    0b4564f View commit details
    Browse the repository at this point in the history

  5. mlt: extra CFLAGS for QtSvg

    @ttuegel
    ttuegel committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    afac783 View commit details
    Browse the repository at this point in the history

  6. qoauth: fix Qt mkspecs install path

    @ttuegel
    ttuegel committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    d817095 View commit details
    Browse the repository at this point in the history

  7. qscintilla: fix qmake install paths

    @ttuegel
    ttuegel committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    abb3479 View commit details
    Browse the repository at this point in the history

  8. qtstyleplugins: remove obsolete install prefix hack

    @ttuegel
    ttuegel committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    bf117e3 View commit details
    Browse the repository at this point in the history

  9. pyqt5: no need to set --qmake in configure

    @ttuegel
    ttuegel committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    4ee3792 View commit details
    Browse the repository at this point in the history

  10. phantomjs2: remove obsolete RPATH hack

    @ttuegel
    ttuegel committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    2522a72 View commit details
    Browse the repository at this point in the history

  11. qt5ct: fix path to lrelease

    @ttuegel
    ttuegel committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    d3c11c5 View commit details
    Browse the repository at this point in the history

  12. rockbox_utility: fix path to lrelease

    @ttuegel
    ttuegel committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    a055cee View commit details
    Browse the repository at this point in the history

  13. qt5: Add instructions for updating and patching

    @ttuegel
    ttuegel committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    ae6ac0e View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' into qt-5-tmp

    @ttuegel
    ttuegel committed Nov 7, 2017
    Configuration menu
    Copy the full SHA
    a853830 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2017

  1. Merge pull request #31357 from ttuegel/qt-5-tmp 

    Qt 5: revert 5.9.2; remove build temporary directory
    Thomas Tuegel committed Nov 8, 2017
    Configuration menu
    Copy the full SHA
    094d088 View commit details
    Browse the repository at this point in the history