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: d3784204ba1a
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: 7c2a362b58a1
Choose a head ref
11 contributors

Commits on Oct 13, 2020

  1. pdns-recursor: 4.2.2 -> 4.2.5 

    Fixes: CVE-2020-25829
    @mweinelt
    mweinelt committed Oct 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    62d9864 View commit details

  2. Merge pull request #100407 from mweinelt/20.03/pdns-recursor/cve-2020… 

    …-25829

[20.03] pdns-recursor: 4.2.2 -> 4.2.5
    @rnhmjoj
    rnhmjoj authored Oct 13, 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
    2871784 View commit details

  3. matrix-synapse: 1.20.1 -> 1.21.0 

    https://github.com/matrix-org/synapse/releases/tag/v1.21.0
(cherry picked from commit 87414de)
    @Ma27
    Ma27 committed Oct 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8e5088c View commit details

  4. python37Packages.canonicaljson: 1.3.0 -> 1.4.0 

    (cherry picked from commit ed9c3d4)
    @r-ryantm @Ma27
    r-ryantm authored and Ma27 committed Oct 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3a10a00 View commit details

Commits on Oct 14, 2020

  1. firefox: 81.0 -> 81.0.2 

    (cherry picked from commit 05b955a)
    @taku0
    taku0 committed Oct 14, 2020
    Copy the full SHA
    e1c3cfe View commit details

  2. firefox-bin: 81.0 -> 81.0.2 

    (cherry picked from commit 68a9d42)
    @taku0
    taku0 committed Oct 14, 2020
    Copy the full SHA
    7c42577 View commit details

  3. firefox-esr: 78.3.0esr -> 78.3.1esr 

    (cherry picked from commit 560cc80)
    @taku0
    taku0 committed Oct 14, 2020
    Copy the full SHA
    9ce60fd View commit details

  4. flashplayer: 32.0.0.433 -> 32.0.0.445 

    (cherry picked from commit 52dcd5b)
(removed ungoogled-chromium)
    @taku0
    taku0 committed Oct 14, 2020
    Copy the full SHA
    51e920d View commit details

  5. Merge pull request #100458 from taku0/firefox-bin-81.0.2_release-20.03 

    [20.03] firefox, firefox-bin: 81.0 -> 81.0.2, firefox-esr: 78.3.0esr -> 78.3.1esr
    @garbas
    garbas authored Oct 14, 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
    b7ae362 View commit details

  6. Merge pull request #100468 from taku0/flashplayer-32.0.0.445_release-… 

    …20.03

[20.03] flashplayer: 32.0.0.433 -> 32.0.0.445 (Critical security fix)
    @garbas
    garbas authored Oct 14, 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
    c1e3ea8 View commit details

  7. thunderbird: 78.2.2 -> 78.3.2 

    (cherry picked from commit e46afe0)
    @taku0
    taku0 committed Oct 14, 2020
    Copy the full SHA
    65153e9 View commit details

  8. thunderbird-bin: 78.2.2 -> 78.3.2 

    (cherry picked from commit 456106f)
    @taku0
    taku0 committed Oct 14, 2020
    Copy the full SHA
    7def3b5 View commit details

  9. linux: 4.14.200 -> 4.14.201

    @NeQuissimus
    NeQuissimus committed Oct 14, 2020

    Verified

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

  10. linux: 4.19.150 -> 4.19.151

    @NeQuissimus
    NeQuissimus committed Oct 14, 2020

    Verified

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

  11. linux: 4.4.238 -> 4.4.239

    @NeQuissimus
    NeQuissimus committed Oct 14, 2020

    Verified

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

  12. linux: 4.9.238 -> 4.9.239

    @NeQuissimus
    NeQuissimus committed Oct 14, 2020

    Verified

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

  13. linux: 5.4.70 -> 5.4.71

    @NeQuissimus
    NeQuissimus committed Oct 14, 2020

    Verified

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

  14. Revert "nixos/display-managers: install sessionData.desktops" 

    This reverts commit d74573d.

Seems to cause issues with MATE for some reason and not really worth it investigating so close to EOL.

Fixes: NixOS/nixpkgs#100464
    @jtojnar
    jtojnar committed Oct 14, 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
    8fa9a8a View commit details

Commits on Oct 16, 2020

  1. Merge #100493: thunderbird-*: 78.3.1 -> 78.3.2

    @vcunat
    vcunat committed Oct 16, 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
    eed40fc View commit details

  2. shotcut: disable upgrade prompt 

    as suggested by @ddennedy
fixes #99851
    @woffs
    woffs committed Oct 16, 2020
    Copy the full SHA
    47a0d2d View commit details

  3. matrix-synapse: 1.21.0 -> 1.21.2 

    https://github.com/matrix-org/synapse/releases/tag/v1.21.1 [1]
https://github.com/matrix-org/synapse/releases/tag/v1.21.2

[1] Not really relevant for as since only a bug in the Debian packaging
    was fixed.

(cherry picked from commit 8886cb6)
    @Ma27
    Ma27 committed Oct 16, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    90813d6 View commit details

Commits on Oct 17, 2020

  1. linux: 4.14.201 -> 4.14.202

    @NeQuissimus
    NeQuissimus committed Oct 17, 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
    8117e60 View commit details

  2. linux: 4.19.151 -> 4.19.152

    @NeQuissimus
    NeQuissimus committed Oct 17, 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
    2db182a View commit details

  3. linux: 4.4.239 -> 4.4.240

    @NeQuissimus
    NeQuissimus committed Oct 17, 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
    357b14c View commit details

  4. linux: 4.9.239 -> 4.9.240

    @NeQuissimus
    NeQuissimus committed Oct 17, 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
    9a9d5ac View commit details

  5. linux: 5.4.71 -> 5.4.72

    @NeQuissimus
    NeQuissimus committed Oct 17, 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
    f702aab View commit details

Commits on Oct 19, 2020

  1. Merge pull request #100753 from woffs/shotcut-remove-upgrade-prompt-2… 

    …0.03

shotcut: disable upgrade prompt
    Christian Kauhaus authored Oct 19, 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
    d7d3210 View commit details

Commits on Oct 20, 2020

  1. Merge #98415: wordnet: Fix darwin build 

    (cherry picked from commit 81b1356)
    @vcunat
    vcunat committed Oct 20, 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
    0056f62 View commit details

  2. Merge #100808: thunderbird*: 78.3.2 -> 78.3.3 

    (cherry picked from commit 176243b)
Re-tested both of them briefly atop 20.03 as well.
    @vcunat
    vcunat committed Oct 20, 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
    7c2a362 View commit details
7 changes: 0 additions & 7 deletions nixos/modules/services/x11/display-managers/default.nix
View file
Original file line number Diff line number Diff line change
@@ -438,13 +438,6 @@ in
)
[dms wms]
);

# Make xsessions and wayland sessions installed at
# /run/current-system/sw/share as some programs
# have behavior that depends on them being installed
environment.systemPackages = [
cfg.displayManager.sessionData.desktops
];
};

imports = [
5 changes: 3 additions & 2 deletions pkgs/applications/misc/wordnet/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}:
{ stdenv, fetchurl, tcl, tk, Cocoa, xlibsWrapper, makeWrapper }:

stdenv.mkDerivation rec {
version = "3.0";
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc";
};

buildInputs = [tcl tk xlibsWrapper makeWrapper];
buildInputs = [ tcl tk xlibsWrapper makeWrapper ]
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];

hardeningDisable = [ "format" ];

4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/chromium/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -45,11 +45,11 @@ let

flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi";
version = "32.0.0.433";
version = "32.0.0.445";

src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "1wfwnmai6wnwi6cfxwqix6n471jjyl6nc7p67sa7cfqwg16b53kx";
sha256 = "1r9vd210d2qp501q40pjx60mzah08rg0f8jk5rpp52ddajwggalv";
stripRoot = false;
};

Loading