diff options
author | Herwig Hochleitner <herwig@bendlas.net> | 2018-01-18 19:19:32 +0100 |
---|---|---|
committer | Herwig Hochleitner <herwig@bendlas.net> | 2018-01-25 20:34:04 +0100 |
commit | 7a2662569d898f71e9c34e96cc4ddfdc49289f7d (patch) | |
tree | d7a28069e92bfb405aff709a36e074000cea236f /pkgs | |
parent | ea01365cff69e8f62d5dcd6a09c9686d0440ea38 (diff) | |
download | nixlib-7a2662569d898f71e9c34e96cc4ddfdc49289f7d.tar nixlib-7a2662569d898f71e9c34e96cc4ddfdc49289f7d.tar.gz nixlib-7a2662569d898f71e9c34e96cc4ddfdc49289f7d.tar.bz2 nixlib-7a2662569d898f71e9c34e96cc4ddfdc49289f7d.tar.lz nixlib-7a2662569d898f71e9c34e96cc4ddfdc49289f7d.tar.xz nixlib-7a2662569d898f71e9c34e96cc4ddfdc49289f7d.tar.zst nixlib-7a2662569d898f71e9c34e96cc4ddfdc49289f7d.zip |
chromium: 63.0.3239.132 -> 64.0.3282.119
CVE-2018-6031 CVE-2018-6032 CVE-2018-6033 CVE-2018-6034 CVE-2018-6035 CVE-2018-6036 CVE-2018-6037 CVE-2018-6038 CVE-2018-6039 CVE-2018-6040 CVE-2018-6041 CVE-2018-6042 CVE-2018-6043 CVE-2018-6045 CVE-2018-6046 CVE-2018-6047 CVE-2018-6048 CVE-2017-15420 CVE-2018-6049 CVE-2018-6050 CVE-2018-6051 CVE-2018-6052 CVE-2018-6053 CVE-2018-6054
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/upstream-info.nix | 18 |
2 files changed, 13 insertions, 17 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e9032ee7675c..b0ce1bb73168 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -138,19 +138,14 @@ let # To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled # Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325 ./patches/fix_network_api_crash.patch - ] # As major versions are added, you can trawl the gentoo and arch repos at + # As major versions are added, you can trawl the gentoo and arch repos at # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # for updated patches and hints about build flags - ++ optionals (versionRange "63" "64") [ - ./patches/chromium-gcc5-r4.patch - (gentooPatch "chromium-gcc5-r5.patch" "0z7rggizzg85wfr8zhw0yfwd3q69lsh3yp297s939jgzp66cwwkw") - ./patches/include-math-for-round.patch + + # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000") ] ++ optionals (versionRange "64" "65") [ - ## This is a first guess on what patches are needed for 64 - # (gentooPatch "chromium-memcpy-r0.patch" "1d3vra59wjg2lva7ddv55ff6l57mk9k50llsplr0b7vxk0lh0ps5") (gentooPatch "chromium-cups-r0.patch" "0hyjlfh062c8h54j4b27y4dq5yzd4w6mxzywk3s02yf6cj3cbkrl") - # (gentooPatch "chromium-clang-r2.patch" "1lsqr7cbjsad5pyyp6kyrfmcgcqy2z2yzgp4zxwjq95fknrfi5a4") (gentooPatch "chromium-angle-r0.patch" "0izdrqwsyr48117dhvwdsk8c6dkrnq2njida1q4mb1lagvwbz7gc") ] ++ optional enableWideVine ./patches/widevine.patch; @@ -215,6 +210,7 @@ let proprietary_codecs = false; use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; + ## FIXME remove use_gconf after chromium 65 has become stable use_gconf = gnomeSupport; use_gio = gnomeSupport; enable_nacl = enableNaCl; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index b15bc16c89dd..3fe73c8669c8 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1mkschqjdn3n3709qkxha1zs626vhh33dp80gi3h6hhk8w0gx4sb"; - sha256bin64 = "05hyfm9j127mprj2wjrq3m9qm4zp3bny40164vscr6vkfxvmjh03"; - version = "64.0.3282.71"; + sha256 = "09ris0aj743x3mh7q45z55byxwmw7h6klhibbcazb1axj85ahbil"; + sha256bin64 = "18833sqqfssjvcmf6v7wj9h9gsc07wr09cms5c0k7f8v9dqysc7r"; + version = "64.0.3282.119"; }; dev = { - sha256 = "1b7f1bs9i7dhrccssn5zk4s62sfpmkj8b4w6aq8g4jbyg7hw9pql"; - sha256bin64 = "0lp8m62p8h60hi8h5nskcjdh6k8vq4g00xbq5limg7d6pgc0vyyz"; - version = "65.0.3311.3"; + sha256 = "04vrcsvlanjljah3pbgfz49ygwr9i6zymr1a09kldrnykv770c5l"; + sha256bin64 = "016s8lh94i0m3zyld32vzqfw1c0s97sa143dyww7x26b2mp93lcc"; + version = "65.0.3322.3"; }; stable = { - sha256 = "139x3cbc5pa14x69493ic8i2ank12c9fwiq6pqm11aps88n6ri44"; - sha256bin64 = "03r97jg1fcb23k1xg5qnw5hp5p9m8anyx346nchbas63rfn439km"; - version = "63.0.3239.132"; + sha256 = "09ris0aj743x3mh7q45z55byxwmw7h6klhibbcazb1axj85ahbil"; + sha256bin64 = "18a61myi3wlrk9zr7jjad1zi8k0ls9cnl2nyhjibjlwiz3npwbm5"; + version = "64.0.3282.119"; }; } |