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: afa9ca61924f
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: 41aa2272feb2
Choose a head ref
  • 7 commits
  • 6 files changed
  • 6 contributors

Commits on Jun 18, 2020

  1. tendermint: 0.32.3 -> 0.32.10 

    (cherry picked from commit ce4e6b8)
    @r-ryantm @alexfmpe
    r-ryantm authored and alexfmpe committed Jun 18, 2020
    Copy the full SHA
    7ccfe75 View commit details

Commits on Jul 5, 2020

  1. firefox-bin: 77.0.1 -> 78.0.1 (PR #92043) 

    (cherry picked from commit 48a2ea4)
Briefly re-tested also on 20.03.
    @ajs124 @vcunat
    ajs124 authored and vcunat committed Jul 5, 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
    b705ed4 View commit details

  2. firefox-beta-bin: 76.0b8 -> 79.0b2 (PR #92043) 

    (cherry picked from commit 84cb46a)
Briefly re-tested also on 20.03; not sure if people use this combination.
    @ajs124 @vcunat
    ajs124 authored and vcunat committed Jul 5, 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
    be00753 View commit details

  3. firefox-esr-68: 68.9.0esr -> 68.10.0esr (PR #92043) 

    (cherry picked from commit 1f02e09)
Briefly re-tested also on 20.03.
    @ajs124 @vcunat
    ajs124 authored and vcunat committed Jul 5, 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
    b008a05 View commit details

  4. crispyDoom: fixed CVE-2020-14983 (#92358) 

    (cherry picked from commit 2d24b8b)

Co-authored-by: Sage Raflik <neonfuz@gmail.com>
    @danieldk @neonfuz
    danieldk and neonfuz authored Jul 5, 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
    74f2559 View commit details

  5. roundcube: 1.4.6 -> 1.4.7 

    https://github.com/roundcube/roundcubemail/releases/tag/1.4.7
(cherry picked from commit d4cf52c)
    @Ma27
    Ma27 committed Jul 5, 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
    1d56d73 View commit details

  6. Merge pull request #91041 from alexfmpe/backport-tendermint-0.32.10 

    [20.03] tendermint: 0.32.3 -> 0.32.10 for security fixes
    @bhipple
    bhipple authored Jul 5, 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
    41aa227 View commit details
770 changes: 385 additions & 385 deletions pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View file

Large diffs are not rendered by default.

770 changes: 385 additions & 385 deletions pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

Large diffs are not rendered by default.

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
@@ -35,10 +35,10 @@ rec {

firefox-esr-68 = common rec {
pname = "firefox-esr";
ffversion = "68.9.0esr";
ffversion = "68.10.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "mEMYANgPfGgK757t4p34IXgQkSoxmn9/jC5jfEPs1PTikiOkF6+ypjFegl+XlFP/bmtaV1ZJq6XMY85ZVjdbuA==";
sha512 = "xcGDNWA2SFHnz46lFlm8T7YCOblgElzbIP4x90LXV//a748xT4ANyRIU7o41gDPcKvlxwIu7pHTvYVixAYgWUw==";
};

patches = [
14 changes: 13 additions & 1 deletion pkgs/games/crispy-doom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }:
{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, fetchpatch }:

stdenv.mkDerivation rec {
pname = "crispy-doom";
@@ -11,6 +11,18 @@ stdenv.mkDerivation rec {
sha256 = "1ls4v2kpb7vi7xji5yqbmyc5lfkz497h1vvj9w86wkrw8k59hlg2";
};

patches = [
# Fixes CVE-2020-14983
(fetchpatch {
url = "https://github.com/chocolate-doom/chocolate-doom/commit/f1a8d991aa8a14afcb605cf2f65cd15fda204c56.diff";
sha256 = "1z6pxg9azcqq7g09hjc09d01knd803nhqilkw2kbx8648hil9mgn";
})
(fetchpatch {
url = "https://github.com/chocolate-doom/chocolate-doom/commit/54fb12eeaa7d527defbe65e7e00e37d5feb7c597.diff";
sha256 = "0ww21jn02ld73rkp06f7fqy92jqv8c9q4d1mvsryag1gmvy57znj";
})
];

postPatch = ''
sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
'';
4 changes: 2 additions & 2 deletions pkgs/servers/roundcube/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "roundcube";
version = "1.4.6";
version = "1.4.7";

src = fetchurl {
url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
sha256 = "06xxzvjd06r90fxpq9zh9fwylg6sbd26c08rxfd553jikyp5znsm";
sha256 = "1jdcda6102n948l6qzhjsiylnmx5fkgjg2hn17g93x3yzwkmvn16";
};

patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];
8 changes: 4 additions & 4 deletions pkgs/tools/networking/tendermint/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,20 +2,20 @@

buildGoModule rec {
pname = "tendermint";
version = "0.32.3";
version = "0.32.10";

src = fetchFromGitHub {
owner = "tendermint";
repo = pname;
rev = "v${version}";
sha256 = "0vpnw42a28glghdpgxmqhxd63cnbpghhazpzsdksqkw0i1l36ywr";
sha256 = "0rf00fqbf8xvxbxnhki93knwdp4bqjvv548ia8c0w6cryj07plyg";
};

modSha256 = "1h51zgvjq3bm09yhm54rk8a86cqa1zma3mx6pb0kq7k72xvhpx0a";
modSha256 = "08f03haxzpi57gaxymsbzs0nbbgnf6z4gmpal476xy3gvc0dyi3r";

meta = with stdenv.lib; {
description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short.";
homepage = https://tendermint.com/;
homepage = "https://tendermint.com/";
license = licenses.asl20;
maintainers = with maintainers; [ alexfmpe ];
platforms = platforms.linux ++ platforms.darwin;