Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: e62e880d6b38
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 0000bf730b94
Choose a head ref
  • 4 commits
  • 11 files changed
  • 2 contributors

Commits on Mar 27, 2019

  1. qt5.qtwebengine: disable platform check using patches 

    The previous code using substituteInPlace was broken for both 5.9 and
5.11 (latter was broken after a minor release bump). Using patches
should make things fail loudly and prevent modules/qtwebengine.nix from
being littered with version checks.

The patch for 5.12 is only tested to apply.

(cherry picked from commit 1809832)
    @veprbl
    veprbl committed Mar 27, 2019
    Copy the full SHA
    d3fecd1 View commit details
    Browse the repository at this point in the history

  2. qt5.qtwebengine: refactor more things to use patches instead of subst… 

    …ituteInPlace

qt59.qtwebengine doesn't need those fixes (probably since the recent
minor version bump)

(cherry picked from commit ccd1bf6)
    @veprbl
    veprbl committed Mar 27, 2019
    Copy the full SHA
    abbe01b View commit details
    Browse the repository at this point in the history

  3. qt59.qtwebengine: fix on darwin 

    This ports a patch that is already used in 5.11. Also one of the
substituteInPlace call fails because a file doesn't exist.

(cherry picked from commit 0624deb)
    @veprbl
    veprbl committed Mar 27, 2019
    Copy the full SHA
    ecca42f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #58431 from alexbiehl/alex/nix-layers 

    dockerTools: align generated layer archives with docker's output
(cherry picked from commit 6af3176)
    @grahamc @shlevy
    grahamc authored and shlevy committed Mar 27, 2019
    Copy the full SHA
    0000bf7 View commit details
    Browse the repository at this point in the history