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: 65562f70456f
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: 36005e5edf5a
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Sep 8, 2018

  1. chromium: 68.0.3440.75 -> 69.0.3497.81 (18.03 backport) 

    Import latest gn from #46328, just from Chromium build, since it will
trigger huge rebuild otherwise.
    @YorikSar
    YorikSar committed Sep 8, 2018
    Copy the full SHA
    ab193a6 View commit details

Commits on Sep 9, 2018

  1. Merge pull request #46389 from YorikSar/update-chromium-18.03 

    chromium: 68.0.3440.75 -> 69.0.3497.81 (18.03 backport)
    @7c6f434c
    7c6f434c authored Sep 9, 2018
    Copy the full SHA
    36005e5 View commit details
14 changes: 3 additions & 11 deletions pkgs/applications/networking/browsers/chromium/common.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, ninja, which, nodejs, fetchurl, fetchpatch, gnutar
{ stdenv, ninja, which, nodejs, fetchurl, fetchpatch, gnutar, callPackage

# default dependencies
, bzip2, flac, speex, libopus
@@ -40,6 +40,7 @@ with stdenv.lib;
# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html

let
gn = callPackage ./gn.nix { };
# The additional attributes for creating derivations based on the chromium
# source tree.
extraAttrs = buildFun base;
@@ -145,11 +146,6 @@ let
# (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
./patches/fix-freetype.patch
./patches/nix_plugin_paths_68.patch
] ++ optionals (versionRange "68" "69") [
./patches/remove-webp-include-68.patch
(githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc")
(githubPatch "56cb5f7da1025f6db869e840ed34d3b98b9ab899" "04mp5r1yvdvdx6m12g3lw3z51bzh7m3gr73mhblkn4wxdbvi3dcs")
] ++ optionals (versionAtLeast version "69") [
./patches/remove-webp-include-69.patch
] ++ optional enableWideVine ./patches/widevine.patch;

@@ -252,15 +248,11 @@ let
configurePhase = ''
runHook preConfigure
# Build gn
python tools/gn/bootstrap/bootstrap.py -v -s --no-clean
PATH="$PWD/out/Release:$PATH"
# This is to ensure expansion of $out.
libExecPath="${libExecPath}"
python build/linux/unbundle/replace_gn_files.py \
--system-libraries ${toString gnSystemLibraries}
gn gen --args=${escapeShellArg gnFlags} out/Release
${gn}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release
runHook postConfigure
'';
49 changes: 49 additions & 0 deletions pkgs/applications/networking/browsers/chromium/gn.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{ stdenv, lib, fetchgit, fetchzip, fetchpatch, darwin
, git, ninja, python }:

stdenv.mkDerivation rec {
name = "gn-${version}";
version = "20180830";

src = fetchgit {
url = "https://gn.googlesource.com/gn";
rev = "106b823805adcc043b2bfe5bc21d58f160a28a7b";
leaveDotGit = true; # gen.py uses "git describe" to generate last_commit_position.h
deepClone = true;
sha256 = "1276jwk3424i78zp21f6hp7idvg6r8qxp8sdfaw8ilkmp7ss19c8";
};

postPatch = ''
# FIXME Needed with old Apple SDKs
substituteInPlace base/mac/foundation_util.mm \
--replace "NSArray<NSString*>*" "NSArray*"
'';

nativeBuildInputs = [ ninja python git ];
buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
libobjc
cctools

# frameworks
ApplicationServices
Foundation
AppKit
]);

buildPhase = ''
python build/gen.py --no-sysroot
ninja -j $NIX_BUILD_CORES -C out gn
'';

installPhase = ''
install -vD out/gn "$out/bin/gn"
'';

meta = with lib; {
description = "A meta-build system that generates NinjaBuild files";
homepage = https://gn.googlesource.com/gn;
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ stesie matthewbauer ];
};
}
12 changes: 0 additions & 12 deletions pkgs/applications/networking/browsers/chromium/patches/remove-webp-include-68.patch
View file

This file was deleted.

18 changes: 9 additions & 9 deletions pkgs/applications/networking/browsers/chromium/upstream-info.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "193sz96jrygixgzkaxx1vrpkhmnr6c7yzhsvv4p1qn0jymh2xd57";
sha256bin64 = "0wwmfsxbphxqfw4g6jgxlr0p32vjf4h8yfd5zz36xpa79dryb8sv";
version = "68.0.3440.68";
sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn";
sha256bin64 = "03k5y1nyzx26mxwxmdijkl2kj49vm5vhbxhakfxxjg3r1v0rsqrs";
version = "69.0.3497.81";
};
dev = {
sha256 = "102lqnl2m9cbcql6sghib1504fyicx7cgv0jkfx863jpzhrfrkcv";
sha256bin64 = "1y3iy25b3cck7kz5g913z64x1wdj1znqbn049g8h82x3krp76bgx";
version = "69.0.3497.12";
sha256 = "1lx6dfd6w675b4kyrci8ikc8rfmjc1aqmm7bimxp3h4p97j5wml1";
sha256bin64 = "0fsxj9h25glp3akw0x2rc488w5zr5v5yvl6ry7fy8w70fqgynffj";
version = "70.0.3538.9";
};
stable = {
sha256 = "0hcmnn72xj9p3y77cb6cnr1vz81hiqmksdi6nw7xqfw5cwr7h5yw";
sha256bin64 = "0pa49yxj9s41mzhik7jixr4hwqanf31yzr1fsc6y5hkadbj7rwij";
version = "68.0.3440.75";
sha256 = "0i3iz6c05ykqxbq58sx954nky0gd0schl7ik2r56p3jqsk8cfnhn";
sha256bin64 = "1f3shb85jynxq37vjxxkkxrjayqgvpss1zws5i28x6i9nygfzay7";
version = "69.0.3497.81";
};
}