diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-04-16 22:46:54 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2020-04-17 13:44:45 +0200 |
| commit | cb5c0a4bbcdb4f3eb23e0d9dc81fa9c7b8f761d8 (patch) | |
| tree | 98a1414b0630a9b8863b73b03da0a9d182efa36e /pkgs/applications/networking/browsers | |
| parent | 357be5c66cff07efdfb8b02dc019111ef062fcc7 (diff) | |
| download | nixlib-cb5c0a4bbcdb4f3eb23e0d9dc81fa9c7b8f761d8.tar nixlib-cb5c0a4bbcdb4f3eb23e0d9dc81fa9c7b8f761d8.tar.gz nixlib-cb5c0a4bbcdb4f3eb23e0d9dc81fa9c7b8f761d8.tar.bz2 nixlib-cb5c0a4bbcdb4f3eb23e0d9dc81fa9c7b8f761d8.tar.lz nixlib-cb5c0a4bbcdb4f3eb23e0d9dc81fa9c7b8f761d8.tar.xz nixlib-cb5c0a4bbcdb4f3eb23e0d9dc81fa9c7b8f761d8.tar.zst nixlib-cb5c0a4bbcdb4f3eb23e0d9dc81fa9c7b8f761d8.zip | |
chromium{Beta,Dev}: M81 -> M83 -> M84
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/upstream-info.nix | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 564e50b86709..c66acac12c38 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -20,7 +20,7 @@ }: let - llvmPackages = if channel == "dev" + llvmPackages = if channel != "stable" then llvmPackages_10 else llvmPackages_9; stdenv = llvmPackages.stdenv; @@ -35,7 +35,7 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone; gnChromium = gn; - } // lib.optionalAttrs (channel == "dev") { + } // lib.optionalAttrs (channel != "stable") { # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-03-23"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 50e3abb5ec3f..cf542faa8a1e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,15 +1,15 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17"; - sha256bin64 = "1iwn0yyhk0jn47pn7rx9kadli47xyvz3xilfl4faifmasin2fq8v"; - version = "81.0.4044.113"; - }; - dev = { sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf"; - sha256bin64 = "1hn2hjni5k370jhc0nikmx5ypwzcqnmr02h185a5ry697643abdd"; + sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax"; version = "83.0.4103.14"; }; + dev = { + sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny"; + sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf"; + version = "84.0.4115.5"; + }; stable = { sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17"; sha256bin64 = "0ap7flrw3h885454fa2r7psa4sh8567ql7v7x96q11gh9gjrdvp3"; |