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: a1119e22395f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 07b3634cb4b3
Choose a head ref
  • 4 commits
  • 5 files changed
  • 1 contributor

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
    primeos committed Apr 14, 2020
    Copy the full SHA
    4424442 View commit details
    Browse the repository at this point in the history

  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
    primeos committed Apr 14, 2020
    Copy the full SHA
    72acf9c View commit details
    Browse the repository at this point in the history

  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
    primeos committed Apr 14, 2020
    Copy the full SHA
    9a7d216 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #84713 from primeos/gn-backport 

    [20.03] gn: 20190403 -> 2020-03-09 (backport)
    @primeos
    primeos committed Apr 14, 2020
    Copy the full SHA
    07b3634 View commit details
    Browse the repository at this point in the history