Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6f31a21f87c2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 26d8a8c0eb2a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 2, 2019

  1. chromium: 72.0.3626.119 -> 72.0.3626.121 

    CVE-2019-5786
    @bendlas
    bendlas committed Mar 2, 2019
    2
    Copy the full SHA
    9a6e646 View commit details

  2. webkitgtk: 2.22.6 -> 2.22.7

    @bendlas
    bendlas committed Mar 2, 2019
    Copy the full SHA
    26d8a8c View commit details
Showing with 10 additions and 10 deletions.
  1. +8 −8 pkgs/applications/networking/browsers/chromium/upstream-info.nix
  2. +2 −2 pkgs/development/libraries/webkitgtk/default.nix
16 changes: 8 additions & 8 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 = "1176qg1a5d5lgy80xsywkz4gq0khfj5hgxykci00j827pryfpajh";
sha256bin64 = "1dqxm82nrabdfwn20j94vs9zgif1jhkqibpx7c1ihq90nw7p17qb";
version = "73.0.3683.46";
sha256 = "00vh4vgkg4dc9vw6slgb086420l2sc6sykr15zw29jhnxaa7b1ij";
sha256bin64 = "0vpwsgz71ykaid240241f7jzsm4d46wad00vvrd4fh9224q4h6ww";
version = "73.0.3683.56";
};
dev = {
sha256 = "0ji6ps97hkwsy9525cdqd3k3k9nyh217h0gfjdkfb7phg6lf46q5";
sha256bin64 = "0dg1qljc2gk8qkwckikq1q5wv7g00blc86nxkaqsr3i12rzy3n8g";
version = "74.0.3710.0";
sha256 = "1cfy6m1ijqh7b8rlrjym8igpm5i549kz1h3jwbpxn52zy3mlk7jr";
sha256bin64 = "02bgg20rh50lsz2ay4p7bkjfb18ay01hj0bcbd3g29valddr35p8";
version = "74.0.3717.0";
};
stable = {
sha256 = "0ylig933xzn6c0018nxq95xhl0wkxcm95fdiy2c7s4a4h3hkr5dk";
sha256bin64 = "04rsgqrr696mq0yr0kmcyslklfnvrnkzf46d479qb2w55q7zh4s5";
version = "72.0.3626.119";
sha256bin64 = "1jdj2jp4jvzi5a24dm56ls5kx6xpiiv98yx4si9z19lm5srrji8j";
version = "72.0.3626.121";
};
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/webkitgtk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
version = "2.22.6";
version = "2.22.7";

meta = {
description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "0ny8azipr2dmdk79qrf4hvb2p4k5b3af38szjhmhg8mh1nfdp46z";
sha256 = "1zrhmz90sn30zgyflj4i86fsscws10xsi2kfs87nj2nd0pbggrjb";
};

patches = optionals stdenv.isDarwin [