diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-02-14 00:50:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-14 00:50:13 +0100 |
| commit | da9de2e115e4b60f36d3433dfe0f1edaacaf5bd2 (patch) | |
| tree | 056856199aecabdc8df02f39fc0a1694a8f06786 /pkgs/applications | |
| parent | f8c3e1577173b96e7a6962419b83086da7becda3 (diff) | |
| parent | 3fadc45499fc4cbf91349b0173061d04691b01bf (diff) | |
| download | nixpkgs-da9de2e115e4b60f36d3433dfe0f1edaacaf5bd2.tar nixpkgs-da9de2e115e4b60f36d3433dfe0f1edaacaf5bd2.tar.gz nixpkgs-da9de2e115e4b60f36d3433dfe0f1edaacaf5bd2.tar.bz2 nixpkgs-da9de2e115e4b60f36d3433dfe0f1edaacaf5bd2.tar.lz nixpkgs-da9de2e115e4b60f36d3433dfe0f1edaacaf5bd2.tar.xz nixpkgs-da9de2e115e4b60f36d3433dfe0f1edaacaf5bd2.tar.zst nixpkgs-da9de2e115e4b60f36d3433dfe0f1edaacaf5bd2.zip | |
Merge pull request #79860 from primeos/chromium
chromium: 80.0.3987.87 -> 80.0.3987.100
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/upstream-info.nix | 18 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/google-chrome/default.nix | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 1baa1d6fcc1..c03685deb91 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 = "13mcn37nhf44bzaafr4bwmmfkihhfi1bzdd6ba2yzfwsbp56y7zm"; - sha256bin64 = "08nvmrrglssrxhp9s8bcj479dfhi83nmnjim6cignfhbzqmwpgdl"; - version = "80.0.3987.87"; + sha256 = "02r0lw14j96py5d3c87r7q3l8a9h5g1qb85rvn8cmbx98m04qip9"; + sha256bin64 = "0adfxgvhcqvlyv4g9ix2a26vgh8f2nxdqbg415x7xijfspbc0apa"; + version = "80.0.3987.100"; }; dev = { - sha256 = "173saw11pvz1fgw60hrfm1hnfjq3hk4zri7jpphk0ws7930zkhf4"; - sha256bin64 = "1g718g0a0m87qkvy0mf1kbhv398iyqks7d9g40cqp5rf1b7yjkw2"; - version = "81.0.4040.5"; + sha256 = "1mfhv2nix1ddqkp4kk5kpn74rv31sk9zma6icajk5cm21m6cqlbb"; + sha256bin64 = "1jschlsy3vsxs471n3p6y84bnqd8yxx3ax38ylvjzg7f9mvy13m1"; + version = "81.0.4044.9"; }; stable = { - sha256 = "13mcn37nhf44bzaafr4bwmmfkihhfi1bzdd6ba2yzfwsbp56y7zm"; - sha256bin64 = "0qdslcl028v0fx8q0n8f5kjkwd8b0z5yz531dbn7wg2dcbp7vq45"; - version = "80.0.3987.87"; + sha256 = "02r0lw14j96py5d3c87r7q3l8a9h5g1qb85rvn8cmbx98m04qip9"; + sha256bin64 = "0l7a8nkhq7qy8lrl20icr169fni1nvkvvxibqipzjzmj7hxdxbpr"; + version = "80.0.3987.100"; }; } diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 9f49925b267..89599158ea0 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -5,7 +5,7 @@ , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsaLib, libXdamage, libXtst, libXrandr, expat, cups , dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core -, kerberos +, kerberos, libdrm, mesa # command line arguments which are always set e.g "--disable-gpu" , commandLineArgs ? "" @@ -60,6 +60,7 @@ let bzip2 libcap at-spi2-atk at-spi2-core kerberos ] ++ optional pulseSupport libpulseaudio + ++ optionals (channel == "dev") [ libdrm mesa ] ++ [ gtk ]; suffix = if channel != "stable" then "-" + channel else ""; |