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: a3b529a46067
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0e418a1a18e1
Choose a head ref
  • 9 commits
  • 116 files changed
  • 1 contributor

Commits on Jan 24, 2021

  1. qmake: Select debug or release build 

    The qmake hook sets its own `CONFIG+=debug` or `CONFIG+=release` depending on
how `qtbase` was built. We no longer rely on using the custom deriver for this
feature.
    @ttuegel
    ttuegel committed Jan 24, 2021
    Configuration menu
    Copy the full SHA
    b80ce0a View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2021

  1. qtbase: Set cmakeFlags and NIX_CFLAGS_COMPILE in setupHook

    @ttuegel
    ttuegel committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    7744998 View commit details
    Browse the repository at this point in the history

  2. nixpkgs/manual: update Qt documentation

    @ttuegel
    ttuegel committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    02924cf View commit details
    Browse the repository at this point in the history

  3. qt.section.md: use new syntax for admonitions

    @ttuegel
    ttuegel committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    e605824 View commit details
    Browse the repository at this point in the history

  4. qt5.mkDerivation: enableParallelBuilding is default

    @ttuegel
    ttuegel committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    3320cdf View commit details
    Browse the repository at this point in the history

  5. wrapQtAppsHook: only run the hook once

    @ttuegel
    ttuegel committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    67b7cff View commit details
    Browse the repository at this point in the history

  6. qtbase: Check for wrapQtAppsHook in setupHook

    @ttuegel
    ttuegel committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    5590e36 View commit details
    Browse the repository at this point in the history

  7. qtbase: Keep debug symbols with developerBuild

    @ttuegel
    ttuegel committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    13e3ec0 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2021

  1. Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDer… 

    …ivation

Qt: Do not require mkDerivation
    @ttuegel
    ttuegel committed Jan 26, 2021
    Configuration menu
    Copy the full SHA
    0e418a1 View commit details
    Browse the repository at this point in the history