public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81016 from primeos/chromium

Browse Source 
chromium: 80.0.3987.116 -> 80.0.3987.122
This commit is contained in:
Michael Weiss 2020-02-26 19:38:21 +01:00 committed by GitHub
commit 954d44f875
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -1,4 +1,4 @@
{ newScope, config, stdenv, llvmPackages_9 { newScope, config, stdenv, llvmPackages_9, llvmPackages_10
, makeWrapper, ed , makeWrapper, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas , glib, gtk3, gnome3, gsettings-desktop-schemas
, libva ? null , libva ? null
@ -19,8 +19,10 @@
}: }:
let let
stdenv = llvmPackages_9.stdenv; llvmPackages = if channel == "dev"
llvmPackages = llvmPackages_9; then llvmPackages_10
else llvmPackages_9;
stdenv = llvmPackages.stdenv;
callPackage = newScope chromium; callPackage = newScope chromium;

18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory. # This file is autogenerated from update.sh in the same directory.
{ {
beta = { beta = {
sha256 = "0vsykl3gaql8fp1h5007ljds8m8q2n6n34dsbcqqav2008zlks61"; sha256 = "1bahnvn6i08gg10r9p012n7xjwhnjk1xq4c70kw6sqr4p53423mn";
sha256bin64 = "1bmszzgmzv7hkczs6kcsa2r8vv6nhg39q1sv74695mr3j3j4bdp8"; sha256bin64 = "066lvnh18k5982dv9481g9i31g9pq6a8q92g93xkqgj2bipbv6si";
version = "81.0.4044.17"; version = "81.0.4044.26";
}; };
dev = { dev = {
sha256 = "0vsykl3gaql8fp1h5007ljds8m8q2n6n34dsbcqqav2008zlks61"; sha256 = "0k35sa1qq54cixybb12nyzkjyrwb4cbjfffwfvr5dl859i5bz1kk";
sha256bin64 = "0xx4h82w6jklwlk8p2a2qqk2a9vnf004hmgw69i8iwk6l1d9hxfb"; sha256bin64 = "0ckbgk6jw3zq3gqvvwdlcrqlm110hkvija6jfh9dk0ip1wdx8wkm";
version = "81.0.4044.17"; version = "82.0.4062.3";
}; };
stable = { stable = {
sha256 = "00c9czjyk1h3i40lvmh2rshp1mq7pcxwsfh1qrq22w8ba6ydkib5"; sha256 = "0wr487drgd030d7p84rdz1cys0c87wbgh2qg3d7qd98gqbfcpss8";
sha256bin64 = "0sydv69hnssbvkrl1zc3qpb1czmfxv9kq6qs9gdiy2i3zskfvhkx"; sha256bin64 = "0kipzd0q3p3wwklcl1fb937xhklc0s76apsfrjwy0jcmcy47blzf";
version = "80.0.3987.116"; version = "80.0.3987.122";
}; };
} }