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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 02589d9b783e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2a2d3de78c95
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 24, 2019

  1. qt5: remove patch merged in 5.12.6 

    Patch for CVE-2019-13720 is included since QT 5.12.6, so it is unnecessary now.
    @FRidh
    Milan Pässler authored and FRidh committed Nov 24, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    endocrimes Danielle
    GPG key ID: 8D65584EF3DDF91B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2a2d3de View commit details
Showing with 0 additions and 9 deletions.
  1. +0 −9 pkgs/development/libraries/qt-5/5.12/default.nix
9 changes: 0 additions & 9 deletions pkgs/development/libraries/qt-5/5.12/default.nix
View file
Original file line number Diff line number Diff line change
@@ -80,15 +80,6 @@ let
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951";
sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am";
})
# patch for CVE-2019-13720, can be removed when it is included in the next upstream release
# https://bugreports.qt.io/browse/QTBUG-1019226
(fetchpatch {
name = "qtwebengine-CVE-2019-13720.patch";
url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=d6e5fc10";
sha256 = "0ywc12m196pr6xn7l5xbascihygkjj4pbcgcn9wxvi5ssdr6z46z";
extraPrefix = "src/3rdparty/";
stripLen = 1;
})
]
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebkit = [ ./qtwebkit.patch ]