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: 19a4f3f79ce7
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: 08bcfe14ae29
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 4, 2020

  1. chromium: 80.0.3987.122 -> 80.0.3987.132 

    https://chromereleases.googleblog.com/2020/03/stable-channel-update-for-desktop.html

This update includes 4 security fixes.

CVEs:
CVE-2020-6420

(cherry picked from commit 51b6f9c)
Backport of #81704.
    @primeos
    primeos committed Mar 4, 2020
    Copy the full SHA
    487b2f7 View commit details

  2. gnome3.glade: 3.22.1 -> 3.22.2 

    (cherry picked from commit acc4854)
    @r-ryantm @jtojnar
    r-ryantm authored and jtojnar committed Mar 4, 2020
    Copy the full SHA
    08bcfe1 View commit details
Showing with 12 additions and 12 deletions.
  1. +9 −9 pkgs/applications/networking/browsers/chromium/upstream-info.nix
  2. +3 −3 pkgs/desktops/gnome-3/apps/glade/default.nix
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 = "1bahnvn6i08gg10r9p012n7xjwhnjk1xq4c70kw6sqr4p53423mn";
sha256bin64 = "066lvnh18k5982dv9481g9i31g9pq6a8q92g93xkqgj2bipbv6si";
version = "81.0.4044.26";
sha256 = "1yam7lg38dbpvmva7pc3bw3npvgi3d1v6im8ld4z92gjgniwsjh2";
sha256bin64 = "0vsly218wv9x2nv5i82slz8pmb0hmdcl1z2mlhf2j5adnsxn9c5z";
version = "81.0.4044.34";
};
dev = {
sha256 = "0k35sa1qq54cixybb12nyzkjyrwb4cbjfffwfvr5dl859i5bz1kk";
sha256bin64 = "0ckbgk6jw3zq3gqvvwdlcrqlm110hkvija6jfh9dk0ip1wdx8wkm";
version = "82.0.4062.3";
sha256 = "0pxvwjvkajlidk5m7jiqk69mxnxg3h56dr7vpi916r51w17pds0l";
sha256bin64 = "1jdyp0f2ig4251155db3m7lzd4jlmczcjqqnvdj5nwl2bn3ykc3s";
version = "82.0.4068.4";
};
stable = {
sha256 = "0wr487drgd030d7p84rdz1cys0c87wbgh2qg3d7qd98gqbfcpss8";
sha256bin64 = "0kipzd0q3p3wwklcl1fb937xhklc0s76apsfrjwy0jcmcy47blzf";
version = "80.0.3987.122";
sha256 = "00f2hpi2d0n15yw29dv3dli566cgi7qh55bfpziag9a6j02i401c";
sha256bin64 = "00xhacrs74ks3nrpsnnbqm5vk0r9ydyxrq5ifajzviqqyk2n24b8";
version = "80.0.3987.132";
};
}
6 changes: 3 additions & 3 deletions pkgs/desktops/gnome-3/apps/glade/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "glade";
version = "3.22.1";
version = "3.22.2";

src = fetchurl {
url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z";
sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd";
};

passthru = {
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Glade;
homepage = "https://wiki.gnome.org/Apps/Glade";
description = "User interface designer for GTK applications";
maintainers = gnome3.maintainers;
license = licenses.lgpl2;