Skip to content
This repository was 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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2ee6b5ce7c3f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f2d4179af38c
Choose a head ref
  • 12 commits
  • 8 files changed
  • 6 contributors

Commits on Apr 7, 2020

  1. Copy the full SHA
    a5a30e8 View commit details

Commits on Apr 10, 2020

  1. Copy the full SHA
    a1119e2 View commit details

Commits on Apr 14, 2020

  1. gn: 20190403 -> 2020-03-09

    This updates gn to the required version for chromiumDev (the recommended
    version for the stable release of Chromium isn't sufficient [0]).
    
    [0]: The Chromium build fails during the configuration phase:
    ERROR at //mojo/public/tools/bindings/mojom.gni:393:16: Undefined identifier
                   "cpp_typemaps",
                   ^-------------
    
    (cherry picked from commit a1b4bfe)
    primeos committed Apr 14, 2020
    Copy the full SHA
    4424442 View commit details
  2. aseprite.skia: Override the gn version to fix the build

    With #83290 merged the build would fail during the configuration phase:
    ```
    configuring
    ERROR at //gn/BUILDCONFIG.gn:85:14: Script returned non-zero exit code.
      is_clang = exec_script("gn/is_clang.py",
                 ^----------
    Current dir: /build/source/out/Release/
    Command: python /build/source/gn/gn/is_clang.py cc c++
    Returned 2.
    stderr:
    
    python: can't open file '/build/source/gn/gn/is_clang.py': [Errno 2] No such file or directory
    ```
    
    (cherry picked from commit ad66bbd)
    primeos committed Apr 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    72acf9c View commit details
  3. chromiumDev: Override gn to fix the configuration phase

    The configuration phase was failing due to:
    ```
    configuring
    ERROR at //BUILD.gn:1376:5: Unknown function.
        filter_exclude([ "$root_build_dir/foo" ],
        ^-------------
    ```
    
    (cherry picked from commit ad3220f)
    primeos committed Apr 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9a7d216 View commit details
  4. Merge pull request #84713 from primeos/gn-backport

    [20.03] gn: 20190403 -> 2020-03-09 (backport)
    primeos authored Apr 14, 2020
    Copy the full SHA
    07b3634 View commit details

Commits on Apr 16, 2020

  1. Copy the full SHA
    a8e2838 View commit details
  2. signal-desktop: 1.33.0 -> 1.33.1

    (cherry picked from commit 56f7c93)
    primeos committed Apr 16, 2020
    Copy the full SHA
    efdee67 View commit details
  3. Merge pull request #85372 from primeos/signal-desktop-backport

    [20.03] signal-desktop: 1.33.0 -> 1.33.1 (backport)
    primeos authored Apr 16, 2020
    Copy the full SHA
    7e466bf View commit details
  4. git: 2.25.0 -> 2.25.3

    v2.25.3 addresses CVE-2020-5260.  /cc roundup #75974.
    
    See https://lore.kernel.org/lkml/xmqqy2qy7xn8.fsf@gitster.c.googlers.com/
    James Ottaway authored and vcunat committed Apr 16, 2020
    Copy the full SHA
    dd3652d View commit details
  5. Copy the full SHA
    0e48b50 View commit details
  6. nixos/stage-1: check secret paths before copying

    Fixes #84976.
    
    (cherry picked from commit 91c6809)
    emilazy authored and lukateras committed Apr 16, 2020
    Copy the full SHA
    f2d4179 View commit details
Loading