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: 57c35c630047
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: 299fbcbb8b59
Choose a head ref
  • 6 commits
  • 6 files changed
  • 6 contributors

Commits on Jan 26, 2020

  1. Merge #78452: thunderbird*: 68.4.1 -> 68.4.2 

    (cherry picked from commit b200b6b)
Re-tested both on 19.09.
    @vcunat
    vcunat committed Jan 26, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    06a8388 View commit details

  2. linux: 5.4.14 -> 5.4.15 

    (cherry picked from commit 8250469)
    @NeQuissimus
    NeQuissimus committed Jan 26, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: FD36A5EAAC49035A
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    53181ab View commit details

  3. file: fix download url for CVE-2019-18218

    @veprbl
    veprbl committed Jan 26, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5c39e8c View commit details

  4. heaptrack: wrap with wrapQtAppsHook 

    (cherry picked from commit 30c2ac9)
    @symphorien @gebner
    symphorien authored and gebner committed Jan 26, 2020
    Copy the full SHA
    399c6ca View commit details

  5. Merge pull request #78479 from veprbl/pr/CVE-2019-18218_url_fix 

    [19.09] file: fix download url for CVE-2019-18218
    @nh2
    nh2 authored Jan 26, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5e97c6f View commit details

  6. snowman: use Qt mkDerivation 

    Fixes #78382
For #65399

(cherry picked from commit 82fbe42)
    @B4dM4n @worldofpeace
    B4dM4n authored and worldofpeace committed Jan 26, 2020
    Copy the full SHA
    299fbcb View commit details
490 changes: 245 additions & 245 deletions pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pkgs/applications/networking/mailreaders/thunderbird/default.nix
View file
Original file line number Diff line number Diff line change
@@ -25,13 +25,13 @@ let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation rec {
pname = "thunderbird";
version = "68.4.1";
version = "68.4.2";

src = fetchurl {
url =
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 =
"2vhhkknc56gmbpp6vi9g3m5war88n0lp4m55ifcrbqq6b1z2zrckzk8zsia9vzzpaz29cvj5sr8q8w2jw3jhal45qqycwil671cpk0n";
"30k0qwg8vb6gj8j8kc198n3v0lzd6bj5khdcdhyw7wrsz0802k2lnai836p9ji5kybf9v8vs5n8g4ml1yl88sxvbg0692ijz8xmkbix";
};

# from firefox, but without sound libraries
4 changes: 2 additions & 2 deletions pkgs/development/tools/analysis/snowman/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, boost, qtbase }:
{ stdenv, mkDerivation, fetchFromGitHub, cmake, boost, qtbase }:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "snowman";
version = "0.1.3";

6 changes: 3 additions & 3 deletions pkgs/development/tools/profiling/heaptrack/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
stdenv, fetchFromGitHub, cmake, extra-cmake-modules,
lib, mkDerivation, fetchFromGitHub, cmake, extra-cmake-modules,
zlib, boost, libunwind, elfutils, sparsehash,
qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons, kdiagram
}:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "heaptrack";
version = "1.1.0";

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons kdiagram
];

meta = with stdenv.lib; {
meta = with lib; {
description = "Heap memory profiler for Linux";
homepage = https://github.com/KDE/heaptrack;
license = licenses.lgpl21Plus;
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.4.14";
version = "5.4.15";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1w6pr0lcpkzjq4n0hnrj02ycdwzvz8lrgy23715zl5pmxsq1h7jk";
sha256 = "1ccldlwj89qd22cl06706w7xzm8n69m6kg8ic0s5ns0ghlpj41v4";
};
} // (args.argsOverride or {}))
6 changes: 5 additions & 1 deletion pkgs/tools/misc/file/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,11 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch {
name = "CVE-2019-18218.patch";
url = "https://sources.debian.org/data/main/f/file/1:5.37-6/debian/patches/cherry-pick.FILE5_37-67-g46a8443f.limit-the-number-of-elements-in-a-vector-found-by-oss-fuzz.patch";
urls = [
"https://src.fedoraproject.org/rpms/file/raw/f6dd8461/f/file-5.37-CVE-2019-18218.patch"
"https://git.in-ulm.de/cbiedl/file/raw/054940e842528dca434a92820f9abb89adce0574/debian/patches/cherry-pick.FILE5_37-67-g46a8443f.limit-the-number-of-elements-in-a-vector-found-by-oss-fuzz.patch"
"https://sources.debian.org/data/main/f/file/1:5.35-4+deb10u1/debian/patches/cherry-pick.FILE5_37-67-g46a8443f.limit-the-number-of-elements-in-a-vector-found-by-oss-fuzz.patch"
];
sha256 = "1i22y91yndc3n2p2ngczp1lwil8l05sp8ciicil74xrc5f91y6mj";
})
];