Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9237a09d8edb
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cae3ac8c30bf
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 22, 2020

  1. chromium{Beta,Dev}: M81 -> M83 -> M84 

    (cherry picked from commit cb5c0a4)
Note: Only M81 is supported on 19.09. This is mainly to cherry-pick
stable channel updates and avoid an insecure chromiumBeta.
    @primeos
    primeos committed Apr 22, 2020
    Copy the full SHA
    dff7016 View commit details

  2. chromiumBeta: Mark as broken

    @primeos
    primeos committed Apr 22, 2020
    Copy the full SHA
    c0439ba View commit details

  3. chromium: 81.0.4044.113 -> 81.0.4044.122 

    https://chromereleases.googleblog.com/2020/04/stable-channel-update-for-desktop_21.html

This update includes 8 security fixes.

CVEs: CVE-2020-6459 CVE-2020-6460 CVE-2020-645
(cherry picked from commit a2df977)
    @primeos
    primeos committed Apr 22, 2020
    Copy the full SHA
    e45440a View commit details

  4. Merge pull request #85760 from primeos/chromium-backport 

    [19.09] chromium: 81.0.4044.113 -> 81.0.4044.122 (backport)
    @flokli
    flokli authored Apr 22, 2020
    Copy the full SHA
    5a3490d View commit details

  5. git: 2.23.2 -> 2.23.3 (security, CVE-2020-11008) 

    See: https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.17.5.txt
    @primeos @FRidh
    primeos authored and FRidh committed Apr 22, 2020
    Copy the full SHA
    cae3ac8 View commit details
7 changes: 6 additions & 1 deletion pkgs/applications/networking/browsers/chromium/browser.nix
View file
Original file line number Diff line number Diff line change
@@ -80,6 +80,11 @@ mkChromiumDerivation (base: rec {
platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
timeout = 172800; # 48 hours
broken = channel == "dev";
broken = channel != "stable"; # M81 is the last supported version for 19.09
# Reason: The build of Chromium 83 requires a lot of additional changes
# (LLVM 10, a newer gn version, some patches, etc.) which are unlikely to be
# backported to 19.09. Therefore we'll only maintain M81 for NixOS 19.09
# which will give us approx. one month of security updates / time for users
# to transition to 20.03 (as per our policy).
};
})
18 changes: 9 additions & 9 deletions pkgs/applications/networking/browsers/chromium/upstream-info.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# 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";
version = "81.0.4044.113";
sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg";
sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w";
version = "81.0.4044.122";
};
}
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/git-and-tools/git/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;

let
version = "2.23.2";
version = "2.23.3";
svn = subversionClient.override { perlBindings = perlSupport; };

gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation {

src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "1wpkk6f63jqvgis6ypaq0jmnxp28dfkd4d36b8skaa10y22yfmrq";
sha256 = "08jq55ysqlybsk0p77yj58irwzp20n1khh3vdcp1cawvcw74yy7h";
};

outputs = [ "out" ];