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: f8248ab6d9e6
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: 41add65fb902
Choose a head ref
  • 4 commits
  • 2 files changed
  • 4 contributors

Commits on Jun 24, 2020

  1. chromium: 83.0.4103.106 -> 83.0.4103.116 

    https://chromereleases.googleblog.com/2020/06/stable-channel-update-for-desktop_22.html

This update includes 2 security fixes.

CVEs: CVE-2020-6509
(cherry picked from commit 46f11f5)
    @thefloweringash @primeos
    thefloweringash authored and primeos committed Jun 24, 2020
    Copy the full SHA
    1b9ed4f View commit details

Commits on Jun 25, 2020

  1. django: update version 2.2.10 to 2.2.11 

    (cherry picked from commit abd30ff)
    @peti @lsix
    peti authored and lsix committed Jun 25, 2020
    Copy the full SHA
    4f0e402 View commit details

  2. pythonPackages.django2_2: 2.2.11 -> 2.2.13 

    Fixes: CVE-2020-13254, CVE-2020-13596
(cherry picked from commit b2da714)
    @mweinelt @lsix
    mweinelt authored and lsix committed Jun 25, 2020
    Copy the full SHA
    f31e602 View commit details

  3. Merge pull request #91427 from primeos/chromium-backport 

    [20.03] chromium: 83.0.4103.106 -> 83.0.4103.116 (backport)
    @primeos
    primeos authored Jun 25, 2020
    Copy the full SHA
    41add65 View commit details
Showing with 11 additions and 11 deletions.
  1. +9 −9 pkgs/applications/networking/browsers/chromium/upstream-info.nix
  2. +2 −2 pkgs/development/python-modules/django/2_2.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 = "0wsqxq8xxcafmjxsjkagysrcbr6qryiyqn6m3ysp256aam7z3d88";
sha256bin64 = "03jff1sdv05hbn37cw0ij0r4rils0q11lnnhxg52igg633jzwyc1";
version = "84.0.4147.45";
sha256 = "1s49qxg0gfmhm1lf5big6hprral21dbzjx0f1cp3xfvag9y61i7h";
sha256bin64 = "1sjvi3qmpwpr51442324a853k6s0k59k4809k8j5sjv7h6arw0sm";
version = "84.0.4147.56";
};
dev = {
sha256 = "16rmzyzjmxmhmr5yqbzqbwf5sq94iqcwlm04fkafiwcycd17nyhs";
sha256bin64 = "0wjmc1wdmwiq9d1f5gk4c9jkj1p116kaz9nb0hvhjf01iv07xl2m";
version = "85.0.4168.2";
sha256 = "1gxa0jg7xff87z7wvllp84a3ii1ypgy4vfzgxs4k7kzg5x0412vi";
sha256bin64 = "0swmn37rmvjvvdcrd002qg1wcvna06y14s3kx34bfr4zxhqk3lby";
version = "85.0.4173.0";
};
stable = {
sha256 = "0bvy17ymlih87n4ymnzvyn0m34ghmr1yasvy7gxv02qbw6i57lfg";
sha256bin64 = "00hjr5y0cczs6h2pxrigpmjiv24456948v32q7mr7x5ysr5kxpn6";
version = "83.0.4103.106";
sha256 = "1hravbi1lazmab2mih465alfzji1kzy38zya1visbwz9zs6pw35v";
sha256bin64 = "1ggyv2b50sclnqph0r40lb8p9h3pq9aq4fj1wdszhwc4rb0cj746";
version = "83.0.4103.116";
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django/2_2.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

buildPythonPackage rec {
pname = "Django";
version = "2.2.10";
version = "2.2.13";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "16h7lw9vnmwarl4pjwc7xnkwmcjq1c79prvfwv8fzixiw65ic9hj";
sha256 = "103db5gmny6bkq9jgr2m6gdfy1n29bj2v87184y1zgpdmkv71ww4";
};

patches = stdenv.lib.optional withGdal