Skip to content
This repository has been 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: a0075f233390
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: 9f5ba92b945d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 26, 2020

  1. firefox-esr-68: mark as insecure

    This is a weaker version of commit 264693f from master.
    vcunat committed Sep 26, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    kquick Kevin Quick
    Copy the full SHA
    93c68ea View commit details
  2. Merge #98684: brotli: fix patch URL

    (cherry picked from commit 779ad18)
    vcunat committed Sep 26, 2020
    Copy the full SHA
    9f5ba92 View commit details
Showing with 5 additions and 1 deletion.
  1. +3 −0 pkgs/applications/networking/browsers/firefox/packages.nix
  2. +2 −1 pkgs/tools/compression/brotli/default.nix
3 changes: 3 additions & 0 deletions pkgs/applications/networking/browsers/firefox/packages.nix
Original file line number Diff line number Diff line change
@@ -75,6 +75,9 @@ rec {

meta = firefox.meta // {
description = "A web browser built from Firefox Extended Support Release source tree";
knownVulnerabilities = [
"Firefox 68 ESR reached end of life with its final release 68.12esr on 2020-08-25 and was therefore marked as insecure"
];
};
updateScript = callPackage ./update.nix {
attrPath = "firefox-esr-68-unwrapped";
3 changes: 2 additions & 1 deletion pkgs/tools/compression/brotli/default.nix
Original file line number Diff line number Diff line change
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];

patches = stdenv.lib.optional staticOnly (fetchpatch {
url = "https://github.com/google/brotli/pull/655/commits/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch";
# from https://github.com/google/brotli/pull/655
url = "https://github.com/google/brotli/commit/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch";
sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg";
});