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: b94c22f71724
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: 023c219aa311
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 20, 2020

  1. nss_latest: 3.56 -> 3.57

    @andir
    andir committed Oct 20, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    16a3eb6 View commit details

  2. firefox: 81.0.2 -> 82.0 

    (cherry picked from commit df959d06c40af7f275741530ad7158faf0a46e1a)
    @andir
    andir committed Oct 20, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f20eefd View commit details

  3. firefox: 78.3.1esr -> 78.4.0esr 

    (cherry picked from commit 910a4bc162a3a2d884999d0ba3e65a454721f10a)
    @andir
    andir committed Oct 20, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    GPG key ID: E432E410B5E48C86
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    386af25 View commit details

  4. Merge pull request #101190 from andir/20.03/firefox-82 

    [20.03] firefox: 81.0.2 -> 82.0, firefox-esr-78: 78.3.1esr -> 78.4.0esr
    @andir
    andir authored Oct 20, 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
    023c219 View commit details
2 changes: 2 additions & 0 deletions pkgs/applications/networking/browsers/firefox/common.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
, icu, icu67, libpng, jemalloc, glib
, autoconf213, which, gnused, cargo, rustc, llvmPackages
, rust-cbindgen, nodejs, nasm, fetchpatch
, gnum4
, debugBuild ? false


@@ -148,6 +149,7 @@ stdenv.mkDerivation ({
++ lib.optional gtk3Support gtk3
++ lib.optional gssSupport kerberos
++ lib.optional waylandSupport libxkbcommon
++ lib.optionals (lib.versionAtLeast ffversion "82") [ gnum4 ]
++ lib.optionals stdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos
AVFoundation MediaToolbox CoreLocation
Foundation libobjc AddressBook cups ];
8 changes: 4 additions & 4 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "81.0.2";
ffversion = "82.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "1szsj7rwpn7ggiavvnc38a75ip0r3p5bgr2kvy2hq7519abzmr3z49jg4alpsy1ndkfylvh28zjw9h5xys0bvs40f33ps90j60z8gla";
sha512 = "3lbvlb6yggd5v0pkr0x6j350jc5dpclqz7bv4i06r97a5ijdgfc7c6y605966hvw24v17byxr120xc7a39ikl1wnls7a9gyzyqcwyw8";
};

patches = [
@@ -35,10 +35,10 @@ rec {

firefox-esr-78 = common rec {
pname = "firefox-esr";
ffversion = "78.3.1esr";
ffversion = "78.4.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "10a7xfp396n81aj17fbl1b1jr8gbn5ild2ig5cfz6r5ff3wfbjs3x0iqrlwqnjfdqq2pw19k2yrv91iwymd8jwjj4p35xsfivgn0a0n";
sha512 = "13640ssp1nq9dsfv8jqfw2paqk3wzwc4r47mvbhb4l9h990gzzb2chhlcjq066b7r3q9s0nq3iyk847vzi7z1yvhrhsnzfgk9g9gpnr";
};

patches = [
4 changes: 2 additions & 2 deletions pkgs/development/libraries/nss/latest.nix
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ let
url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz";
sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
};
version = "3.56";
version = "3.57";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;

in stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz";
sha256 = "174f0ki2f8szkgv02jlsg2ci332sl9dabr2vcwnyjp1vxplf0xgq";
sha256 = "10n3pncg6k81ikjz12la147rppwqn57bkrdl9gb820w6pq0nra2m";
};

depsBuildBuild = [ buildPackages.stdenv.cc ];