diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-08-26 22:27:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-26 22:27:11 +0200 |
commit | b8fb1e15b9b452334dde66285b75aef3621c043d (patch) | |
tree | d391090b6948f17800992c2f9643a54cdb5b5bfd | |
parent | 2f5277d92eca0b19096255a67c65bd4864ae54c1 (diff) | |
parent | 25aed428aa9974615e628f842aaf4a0db926cdec (diff) |
Merge pull request #96308 from primeos/chromium
chromium: 84.0.4147.135 -> 85.0.4183.83
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/upstream-info.nix | 18 |
2 files changed, 11 insertions, 20 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 2429baba4b366..f4ddd755fa153 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -28,7 +28,7 @@ let callPackage = newScope chromium; - chromium = { + chromium = rec { inherit stdenv llvmPackages; upstream-info = (callPackage ./update.nix {}).getChannel channel; @@ -37,15 +37,6 @@ let inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-03-23"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "5ed3c9cc67b090d5e311e4bd2aba072173e82db9"; - sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy"; - }; - }); - } // lib.optionalAttrs (channel == "beta") { - gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-05-19"; src = fetchgit { url = "https://gn.googlesource.com/gn"; @@ -53,7 +44,7 @@ let sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17"; }; }); - } // lib.optionalAttrs (channel == "dev") { + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") { gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-07-20"; src = fetchgit { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 14e9f306bf9f6..5639ff2b67915 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 = "0i7vd0w1swvxw46wiy1xrni02xa7yvccw4cp9v2dc2lm5r43dw5q"; - sha256bin64 = "0by3fgmd54zj5q5znazrl3vf42ik3rhirwy5815i7isqiq7bb6lq"; - version = "85.0.4183.69"; + sha256 = "0fz781bxx1rnjwfix2dgzq5w1lg3x6a9vd9k49gh4z5q092slr10"; + sha256bin64 = "12nm7h70pbzwc5rc7kcwfwgjs0h8cdnys5wlfjkbq6irwb6m1lm6"; + version = "85.0.4183.83"; }; dev = { - sha256 = "1yasmx3alal3gygyjvvjk799z0b6p6nm7q10m0qyls2mpfvxpcyw"; - sha256bin64 = "0lp93z9qwdbjblmj0d514plk44hs0yqw1v7vr5mnrrx6l9gm0yg0"; - version = "86.0.4229.0"; + sha256 = "16yj47x580i8p88m88f5bcs85qmrfwmyp9na7yrnk0lnq06wbj4i"; + sha256bin64 = "0i81xcfdn65j2i4vfx52v4a9vlar8y9ykqdhshymqfz4qqqk37d1"; + version = "86.0.4238.0"; }; stable = { - sha256 = "1n4n95gllqmsrzxmcp9p4gz95gndq2v3vknfvm8p1qfhjqah0hfx"; - sha256bin64 = "1ak903wm8zq6pri88md2wdij3izr6kz9d4avyqnpmd68ch16vfnj"; - version = "84.0.4147.135"; + sha256 = "0fz781bxx1rnjwfix2dgzq5w1lg3x6a9vd9k49gh4z5q092slr10"; + sha256bin64 = "0fa3la2nvqr0w40j2qkbwnh36924fsp2ajsla6aky6hz08mq2q1g"; + version = "85.0.4183.83"; }; } |