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: 9584ce65b7cb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d15a31f88a26
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Oct 21, 2019

  1. mbedtls: 2.15.1 -> 2.16.0 (#53278) 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mbedtls/versions

(cherry picked from commit 436b925)
    @r-ryantm @fpletz
    r-ryantm authored and fpletz committed Oct 21, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thoughtpolice Austin Seipp
    GPG key ID: 25D2038DEB08021D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    866194c View commit details

  2. mbedtls: 2.16.0 -> 2.16.3 

    Fixes CVE-2019-16910. Fixes #71452.

(cherry picked from commit 360e57a)
    @fpletz
    fpletz committed Oct 21, 2019
    Copy the full SHA
    8cc0abc View commit details

Commits on Oct 22, 2019

  1. firefox-esr: 68.1.0esr -> 68.2.0esr 

    (cherry picked from commit 20dae73)
    @taku0 @andir
    taku0 authored and andir committed Oct 22, 2019
    Copy the full SHA
    d15a31f View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/applications/networking/browsers/firefox/packages.nix
  2. +2 −2 pkgs/development/libraries/mbedtls/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -92,10 +92,10 @@ rec {

firefox-esr-68 = common rec {
pname = "firefox-esr";
ffversion = "68.1.0esr";
ffversion = "68.2.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0n8iy9xwf8wldkknq3y3nlm0cmb48baamvz4wmmbpfb2kfrxbsj3wnnd9ayk9zxhrsdq0na9gvkc374mv06nyqijrahd67wljv08fx5";
sha512 = "3p4gic3nlz1rxfc64xnv6vgfvf84w8752vpkdc1sfl3qx0w05q5d23rsvmkm8nb45bnsq3ch3jsrsh4p6fan4k9hvmzv8zgp6k2qlpn";
};

patches = [
4 changes: 2 additions & 2 deletions pkgs/development/libraries/mbedtls/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,13 +11,13 @@

stdenv.mkDerivation rec {
name = "mbedtls-${version}";
version = "2.15.1";
version = "2.16.3";

src = fetchFromGitHub {
owner = "ARMmbed";
repo = "mbedtls";
rev = name;
sha256 = "0w6cm2f7d43wp8cx6r5h4icq8zcix1jnvivshypir1rbk1q83gx8";
sha256 = "1mzh92yyz93099a1gb2wvwc76jv12d1k1wg9k3dimbgczxgrkirc";
};

nativeBuildInputs = [ cmake ninja perl python ];