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: 1f0b057f869c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d8d882e9978c
Choose a head ref
  • 8 commits
  • 4 files changed
  • 4 contributors

Commits on Jan 8, 2020

  1. gdk-pixbuf: upstream patch to fix the nixos test 

    (cherry picked from commit 754d02d)
It's safe: it just installs a new file into otherwise unused output.
Tested nixos.tests.gdk-pixbuf.x86_64-linux
    @vcunat
    vcunat committed Jan 8, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3ad0990 View commit details

Commits on Jan 9, 2020

  1. libxml: add patch for CVE-2019-19956 

    See https://nvd.nist.gov/vuln/detail/CVE-2019-19956
    @markuskowa
    markuskowa committed Jan 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4bbd82f View commit details

Commits on Jan 11, 2020

  1. Merge branch 'release-19.09' into staging-19.09

    @vcunat
    vcunat committed Jan 11, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2040145 View commit details

  2. Merge #77366: libxml2: patch CVE-2019-19956 

    ... into staging-19.09
    @vcunat
    vcunat committed Jan 11, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8c96cdf View commit details

  3. chromium: 79.0.3945.79 -> 79.0.3945.88 

    https://chromereleases.googleblog.com/2019/12/stable-channel-update-for-desktop_17.html

CVE-2019-13767
    @ivan @mebubo
    ivan authored and mebubo committed Jan 11, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f6047ce View commit details

Commits on Jan 12, 2020

  1. darwin.CF: fix retry condition (close PR #75528) 

    Using a function in an if condition when set -e is set doesn't seem to
break out or return false which means the workaround from 41ca861
never gets triggered.

(cherry picked from commit d5d8b35)
    @LnL7 @vcunat
    LnL7 authored and vcunat committed Jan 12, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    101fa79 View commit details

Commits on Jan 13, 2020

  1. Merge #77528: chromium: 79.0.3945.79 -> 79.0.3945.88 

    ...into release-19.09
    @vcunat
    vcunat committed Jan 13, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fb6a164 View commit details

  2. Merge branch 'staging-19.09' into release-19.09

    @vcunat
    vcunat committed Jan 13, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d8d882e View commit details
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 = "1wxw4l4hhk91x7drcamaxvh03ckxwv5567ccmpk743vb74nkd9z1";
sha256bin64 = "1fzgdfph2jj3rac868y3r0mlgqj740bivrgh1nq51v3ni507366n";
version = "79.0.3945.79";
sha256 = "1j9zfbyil16yhf6hzrd0ssy9k49jx468dbmgzhc20l1548fif62g";
sha256bin64 = "1jfsswjqzdif6824p9a6raw5j9309y61c80kgfq23247vr514ky9";
version = "79.0.3945.88";
};
dev = {
sha256 = "18ijz7ailnmmz6b9n1jkdj0v8wiqdr845xzi0f7n5xcp4wf7xafk";
sha256bin64 = "19irp7x44h49cs1wvwv34jl0inwxk0g6vb44p4ab1jmfmdznv9lx";
version = "80.0.3983.2";
sha256 = "1fbs6llrhm9jkzmk3v3a84d9is6g96kysy91hvpb0bw8f7anl969";
sha256bin64 = "04fscphs4w6jb1kdc25jc568r3k4x3nmg0apggjfnbdwzb5zkmf2";
version = "80.0.3987.16";
};
stable = {
sha256 = "1wxw4l4hhk91x7drcamaxvh03ckxwv5567ccmpk743vb74nkd9z1";
sha256bin64 = "0dygich61ldy20bqcc84c396vkarmjp1syhyslzkg9kwn9xzr7gb";
version = "79.0.3945.79";
sha256 = "1j9zfbyil16yhf6hzrd0ssy9k49jx468dbmgzhc20l1548fif62g";
sha256bin64 = "1k44fnn41n73j1lff4h8s8f79pw8w180n467lwff4g9izh6c2blz";
version = "79.0.3945.88";
};
}
10 changes: 9 additions & 1 deletion pkgs/development/libraries/gdk-pixbuf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{ stdenv, fetchurl, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
, jasper, gobject-introspection, doCheck ? false, makeWrapper }:
, jasper, gobject-introspection, doCheck ? false, makeWrapper
, fetchpatch
}:

let
pname = "gdk-pixbuf";
@@ -16,6 +18,12 @@ in stdenv.mkDerivation rec {
patches = [
# Move installed tests to a separate output
./installed-tests-path.patch
# Temporary until the fix is released.
(fetchpatch {
name = "tests-circular-table.patch";
url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/59.diff";
sha256 = "0kaflac3mrh6031hwxk7j9fhli775hc503818h8zfl6b28zyn93f";
})
];

outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
8 changes: 7 additions & 1 deletion pkgs/development/libraries/libxml2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl
{ stdenv, lib, fetchurl, fetchpatch
, zlib, xz, python2, ncurses, findXMLCatalogs
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
, icuSupport ? false, icu ? null
@@ -18,6 +18,12 @@ in stdenv.mkDerivation rec {
sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl";
};

patches = [ (fetchpatch {
name = "CVE-2019-19956"; # Upstream patch
url = "https://gitlab.gnome.org/GNOME/libxml2/commit/5a02583c7e683896d84878bd90641d8d9b0d0549.patch";
sha256 = "05r36wb3jfiqqr595v8y1djb535pk99lvajvsi5rq7x90k8s6g61";
})];

outputs = [ "bin" "dev" "out" "man" "doc" ]
++ lib.optional pythonSupport "py"
++ lib.optional (enableStatic && enableShared) "static";
4 changes: 2 additions & 2 deletions pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix
View file
Original file line number Diff line number Diff line change
@@ -76,8 +76,8 @@ stdenv.mkDerivation {
# later.
buildPhase = stdenv.lib.optionalString true ''
for i in {1..512}; do
if ninjaBuildPhase; then
break
if ninja -j $NIX_BUILD_CORES; then
break
fi
echo >&2