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: 3090c6504110
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: caadf99cf5ee
Choose a head ref
  • 14 commits
  • 19 files changed
  • 6 contributors

Commits on Nov 4, 2020

  1. llvmPackages_11.clang-unwrapped: Inherit clang-tools-extra_src

    So that it can be accessed via llvmPackages_11.clang-unwrapped.clang-tools-extra_src
    (e.g. useful for nix-prefetch-url).
    
    (cherry picked from commit 72cc4d2)
    primeos committed Nov 4, 2020
    Copy the full SHA
    4735c9a View commit details
    Browse the repository at this point in the history
  2. llvm_11: link to the llvm compiler-rt share directory from the wrapper (

    #100190)
    
    A port of #85925 for LLVM 11 to enable CFI for Chromium.
    
    This is required for features such as `-fsanitize=cfi` that (by default)
    load the file `…/resource-root/share/cfi_blacklist.txt`.
    
    (cherry picked from commit 03dd1b3)
    TredwellGit authored and primeos committed Nov 4, 2020
    Copy the full SHA
    49ebef3 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    b348fcc View commit details
    Browse the repository at this point in the history
  4. clang_11: forward-port #91293

    (cherry picked from commit 7a30df9)
    ggreif authored and primeos committed Nov 4, 2020
    Copy the full SHA
    b2b839a View commit details
    Browse the repository at this point in the history
  5. llvmPackages_11.compiler-rt: enable support for i486 i586 i686

    compiler-rt (and as a result clang) can't be build for i686 (as noticed here: #99984).
    The patch adds the required variables and should result in the same behavior as in the nixpkgs-llvm10. It essentially forces to use i386 buildins when using i486, i586 or i686, which are not supported.
    
    Fixes #100392
    
    (cherry picked from commit 6948875)
    DieGoldeneEnte authored and primeos committed Nov 4, 2020
    Copy the full SHA
    bd49939 View commit details
    Browse the repository at this point in the history
  6. chromium: Drop the libwebp include patch

    Chromium 86.0.4240.75 builds fine without this patch. And since
    WEBP_MAX_DIMENSION is the same in the system libwebp this patch should
    not be required anymore (it was introduced in 06ec2a9, apparently to
    fix the build).
    
    (cherry picked from commit 015c5a2)
    primeos committed Nov 4, 2020
    Copy the full SHA
    616c488 View commit details
    Browse the repository at this point in the history
  7. chromium: build on all cores

    (cherry picked from commit 5742fcd)
    volth authored and primeos committed Nov 4, 2020
    Copy the full SHA
    aeba745 View commit details
    Browse the repository at this point in the history
  8. chromium: build on $NIX_BUILD_CORES

    (cherry picked from commit 8e861c0)
    volth authored and primeos committed Nov 4, 2020
    Copy the full SHA
    a8287a0 View commit details
    Browse the repository at this point in the history
  9. chromium: fix build on i686 (#100512)

    ld.gold runs out of memory on i686.
    
    (cherry picked from commit c557c27)
    conferno authored and primeos committed Nov 4, 2020
    Copy the full SHA
    9e47bd3 View commit details
    Browse the repository at this point in the history
  10. chromium: Add some brief documentation

    Wanted to do this for a long time to collect important knowledge and
    make it easier to pass maintainership.
    Only time will tell if this'll be useful or become outdated instead.
    
    (cherry picked from commit b36db49)
    primeos committed Nov 4, 2020
    Copy the full SHA
    ae3bbb9 View commit details
    Browse the repository at this point in the history
  11. chromium: Extend update.py to automatically update gn

    The gn version depends on the channel and new gn versions aren't always
    backward compatible. Therefore we should also include it in
    upstream-info.json (I've scoped it under "deps" as we'll likely have to
    add more like this in the future).
    
    (cherry picked from commit d7f5386)
    primeos committed Nov 4, 2020
    Copy the full SHA
    5637410 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2020

  1. chromium: 86.0.4240.183 -> 86.0.4240.193

    https://chromereleases.googleblog.com/2020/11/stable-channel-update-for-desktop_9.html
    
    This update includes 1 security fix (no CVE).
    
    (cherry picked from commit 841664a)
    Backport of #103294.
    primeos committed Nov 13, 2020
    Copy the full SHA
    3af6255 View commit details
    Browse the repository at this point in the history
  2. chromium: 86.0.4240.193 -> 86.0.4240.198

    https://chromereleases.googleblog.com/2020/11/stable-channel-update-for-desktop_11.html
    
    This update includes 2 security fixes. Google is aware of reports that
    exploits for CVE-2020-16013 and CVE-2020-16017 exist in the wild.
    
    CVEs: CVE-2020-16013 CVE-2020-16017
    (cherry picked from commit b91153f)
    Backport of #103595.
    primeos committed Nov 13, 2020
    Copy the full SHA
    ded16fc View commit details
    Browse the repository at this point in the history
  3. Merge pull request #102758 from primeos/chromium-backport

    [20.09] chromium, llvm_11: Backport additional patches
    primeos committed Nov 13, 2020
    Copy the full SHA
    caadf99 View commit details
    Browse the repository at this point in the history