Skip to content

[20.03] firefox: 76.0.1 -> 77.0.1 #89800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edolstra merged 5 commits into from
Jun 11, 2020
Merged

[20.03] firefox: 76.0.1 -> 77.0.1 #89800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
582b4bb
nss_3_52: 3.52.0 -> 3.52.1
andir Jun 5, 2020
e3e66c8
rust-cbindgen_0_14_1: init
andir Jun 5, 2020
03be5f3
firefox: 76.0.1 -> 77.0.1
ajs124 Jun 3, 2020
f7446a5
firefox-esr-68: 68.8.0esr -> 68.9.0esr
ajs124 Jun 3, 2020
fb93299
firefox-bin: 76.0 -> 77.0.1
ajs124 Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
770 changes: 385 additions & 385 deletions pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions pkgs/applications/networking/browsers/firefox/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@
, xcbuild, CoreMedia, ExceptionHandling, Kerberos, AVFoundation, MediaToolbox
, CoreLocation, Foundation, AddressBook, libobjc, cups, rsync

# dependencies requires for stable backports

, rust-cbindgen_0_14_1

## other

# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
Expand Down Expand Up @@ -96,6 +100,7 @@ let

nss_pkg = if lib.versionAtLeast ffversion "74" then nss_3_52 else nss;
sqlite_pkg = if lib.versionAtLeast ffversion "74" then sqlite_3_31_1 else sqlite;
rust-cbindgen_pkg = if lib.versionAtLeast ffversion "77" then rust-cbindgen_0_14_1 else rust-cbindgen;

in

Expand Down Expand Up @@ -151,7 +156,6 @@ stdenv.mkDerivation ({
"-Wno-error=format-security");

postPatch = ''
substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h'
rm -rf obj-x86_64-pc-linux-gnu
'';

Expand All @@ -166,7 +170,7 @@ stdenv.mkDerivation ({
pkgconfig
python2
python3
rust-cbindgen
rust-cbindgen_pkg
rustc
which
]
Expand Down
13 changes: 4 additions & 9 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,14 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "76.0.1";
ffversion = "77.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0gnhfcgrz6022xf3vqia3s3639xa5pjp13h343d3c09mn8r919cmm6s38vzj1v3734fm25zb68acyarsp72xqq8z1420rh02b2pv38q";
sha512 = "ngLihC0YuclLJEV3iPEX+tRzDKIdBe+CCOuFxvWNo7DnX8royOvTj2m4YyWyZoTQ5UCbPTQYmP4otgfovZSe8g==";
};

patches = [
./no-buildconfig-ffx76.patch
# Fix for NSS 3.52 (add missing CK_GCM_PARMS field)
(fetchpatch {
url = "https://hg.mozilla.org/mozilla-central/raw-rev/463069687b3d";
sha256 = "00yhz67flnkww3rbry0kqn6z6bm7vxfb2sgf7qikgbjcm3ysvpsm";
})
];

meta = {
Expand All @@ -40,10 +35,10 @@ rec {

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

patches = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/nss/3_52.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.52";
version = "3.52.1";
underscoreVersion = builtins.replaceStrings ["."] ["_"] version;

in stdenv.mkDerivation rec {
Expand All @@ -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 = "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha";
sha256 = "0y4jb9095f7bbgw7d7kvzm4c3g4p5i6y68fwhb8wlkpb7b1imj5w";
};

depsBuildBuild = [ buildPackages.stdenv.cc ];
Expand Down
29 changes: 29 additions & 0 deletions pkgs/development/tools/rust/cbindgen/0_14_1.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub, rustPlatform, Security }:

rustPlatform.buildRustPackage rec {
pname = "rust-cbindgen";
version = "0.14.1";

src = fetchFromGitHub {
owner = "eqrion";
repo = "cbindgen";
rev = "v${version}";
sha256 = "0dphy7w4lgyjmj1rbj99pdql1dnfkmic78iz1jglyy6z6p3za3qj";
};

cargoSha256 = "13fb8cdg6r0g5jb3vaznvv5aaywrnsl2yp00h4k8028vl8jwwr79";

buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

checkFlags = [
# https://github.com/eqrion/cbindgen/issues/338
"--skip test_expand"
];

meta = with stdenv.lib; {
description = "A project for generating C bindings from Rust code";
homepage = https://github.com/eqrion/cbindgen;
license = licenses.mpl20;
maintainers = with maintainers; [ andir ];
};
}
5 changes: 5 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8878,6 +8878,11 @@ in
rust-cbindgen = callPackage ../development/tools/rust/cbindgen {
inherit (darwin.apple_sdk.frameworks) Security;
};

rust-cbindgen_0_14_1 = callPackage ../development/tools/rust/cbindgen/0_14_1.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};

rustup = callPackage ../development/tools/rust/rustup {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
Expand Down