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: ee067a67bd27
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f80a55ca37a6
Choose a head ref
  • 13 commits
  • 66 files changed
  • 4 contributors

Commits on Nov 12, 2017

  1. qt56.qtwebkit: fix build with ICU 59

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

  2. qt56: remove unused obsolete expressions

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

  3. qt56.qtbase: replace type with command for POSIX compatibility

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

  4. qt5.mkDerivation: default enableParallelBuilding = true

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

  5. qt59.qtbase: replace type with command for POSIX compatibility

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

  6. qt56: 5.6.2 -> 5.6.3

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

  7. qt59.qtbase: restore Darwin collection-types patch

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

  8. qt59.qtbase: carefully avoid applying Linux flags to Darwin build

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

  9. Merge branch 'qt-fixes' into staging

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

Commits on Nov 13, 2017

  1. Merge remote-tracking branch 'channels/nixos-unstable' into staging

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

  2. webkitgtk: 2.18.2 -> 2.18.3 (fixes multiple CVE's)

    @globin
    Samuel Leathers authored and globin committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    6e686ff View commit details
    Browse the repository at this point in the history

  3. Merge branch 'staging'

    @vcunat
    vcunat committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    e04339d View commit details
    Browse the repository at this point in the history

  4. libbsd, libtiger: fix meta evaluation 

    I suppose we'll one day transition to forced automatic checks of some
basic things before pushing/merging.
    @vcunat
    vcunat committed Nov 13, 2017
    3 Configuration menu
    Copy the full SHA
    f80a55c View commit details
    Browse the repository at this point in the history