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: c0303c711046
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 1593bd24235f
Choose a head ref
  • 4 commits
  • 59 files changed
  • 2 contributors

Commits on Jun 23, 2017

  1. plasma-workspace: no propagatedBuildInputs 

    Only libraries may have propagatedBuildInputs.
    @ttuegel
    ttuegel committed Jun 23, 2017
    Configuration menu
    Copy the full SHA
    0d1a1a4 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2017

  1. qt5: 5.8.0 -> 5.9.0 

    Qt 5.8 is immediately removed because its support window is ended.

The qtlocation module is built with `enableParallelBuilding = false` so that the
clipper library will be built before the components which link to it.

kjs now depends directly on pcre. The dependency was previously propagated from
qtbase, which now depends on pcre2.
    @ttuegel
    ttuegel committed Jun 24, 2017
    Configuration menu
    Copy the full SHA
    22b10ba View commit details
    Browse the repository at this point in the history

  2. khotkeys: fix intermittant parallel build failure

    @ttuegel
    ttuegel committed Jun 24, 2017
    2 Configuration menu
    Copy the full SHA
    69438a3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #26817 from ttuegel/qt-5.9 

    Qt 5.9
    Thomas Tuegel committed Jun 24, 2017
    Configuration menu
    Copy the full SHA
    1593bd2 View commit details
    Browse the repository at this point in the history