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: eb97f45360d1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 26e5c0f07a66
Choose a head ref
  • 11 commits
  • 11 files changed
  • 2 contributors

Commits on Dec 27, 2018

  1. pyqt5: remove old fixes 

    Since about 5 hydra evaluations ago the build log has:

substituteStream(): WARNING: pattern 'install_dir=pydbusmoddir' doesn't match anything in file 'configure.py'
substituteStream(): WARNING: pattern 'ModuleMetadata(qmake_QT=['webkitwidgets'])' doesn't match anything in file 'configure.py'

Looking at the original configure.py I don't see any mention of
pydbusmoddir and ModuleMetadata seems to be set like the patch suggests:

    'QtWebKitWidgets':      ModuleMetadata(
                                    qmake_QT=['webkitwidgets',
                                            'printsupport']),

It appears that we don't need the fix anymore.

Reverts: d3ed0ab ('PyQt: fix build')
    @veprbl
    veprbl committed Dec 27, 2018
    Copy the full SHA
    9b07d48 View commit details
    Browse the repository at this point in the history

  2. pyqt5: make qtwebkit optional, disable by default 

    qtwebkit appears to be unsupported in Qt 5.11. We are using some old port
https://github.com/NixOS/nixpkgs/blob/475d653afdbd8fe3e00ccfd22a30014b0df7aeaa/pkgs/development/libraries/qt-5/5.11/default.nix#L39-L48
and it is broken on darwin.
    @veprbl
    veprbl committed Dec 27, 2018
    Copy the full SHA
    facefec View commit details
    Browse the repository at this point in the history

  3. pyqt5: refactor

    @veprbl
    veprbl committed Dec 27, 2018
    Copy the full SHA
    3c19829 View commit details
    Browse the repository at this point in the history

  4. treewide: use pythonPackages.pyqt5_with_qtwebkit where QtWebKit is ne… 

    …eded
    @veprbl
    veprbl committed Dec 27, 2018
    Copy the full SHA
    20d60c8 View commit details
    Browse the repository at this point in the history

  5. pythonPackages.qtconsole: build on darwin 

    Fixes: d7ef9a7 ('python36Packages.qtconsole: 4.4.2 -> 4.4.3')
    @veprbl
    veprbl committed Dec 27, 2018
    Copy the full SHA
    97ec7a9 View commit details
    Browse the repository at this point in the history

  6. pyqt5_with_qtwebkit: add warning comment

    @veprbl
    veprbl committed Dec 27, 2018
    Copy the full SHA
    07a6736 View commit details
    Browse the repository at this point in the history

  7. qutebrowser: drop QtWebKit support 

    From the qutebrowser README:

  "support for QtWebKit will be dropped soon"
    @veprbl
    veprbl committed Dec 27, 2018
    Copy the full SHA
    8df467e View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2018

  1. electron-cash: doesn't need QtWebKit 

    Upstream issue:
Electron-Cash/Electron-Cash#1078
    @veprbl
    veprbl committed Dec 30, 2018
    Copy the full SHA
    ae87977 View commit details
    Browse the repository at this point in the history

  2. frescobaldi: add explicit dependency on sip

    @veprbl
    veprbl committed Dec 30, 2018
    Copy the full SHA
    16f11df View commit details
    Browse the repository at this point in the history

  3. git-cola: doesn't need QtWebKit 

    QtWebKit is only used if QtWebEngine is not available
    @veprbl
    veprbl committed Dec 30, 2018
    Copy the full SHA
    eecc336 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #51846 from veprbl/pr/pyqt5_opt_qtwebkit 

    pyqt5: make qtwebkit optional, disable by default
    @FRidh
    FRidh committed Dec 30, 2018
    Copy the full SHA
    26e5c0f View commit details
    Browse the repository at this point in the history