public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #48862 from andir/firefox

Browse Source 
firefox{,bin}: 62.0.3 -> 63.0 & nss: 3.38-> 3.39
This commit is contained in:
Andreas Rammhold 2018-10-25 07:29:07 +02:00 committed by GitHub
commit d17ab805fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 407 additions and 404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

794
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

5
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -10,6 +10,7 @@
, hunspell, libevent, libstartup_notification, libvpx , hunspell, libevent, libstartup_notification, libvpx
, icu, libpng, jemalloc, glib , icu, libpng, jemalloc, glib
, autoconf213, which, gnused, cargo, rustc, llvmPackages , autoconf213, which, gnused, cargo, rustc, llvmPackages
, rust-cbindgen, nodejs
, debugBuild ? false , debugBuild ? false
### optionals ### optionals
@ -111,7 +112,6 @@ stdenv.mkDerivation rec {
"-I${glib.dev}/include/gio-unix-2.0" "-I${glib.dev}/include/gio-unix-2.0"
] ]
++ lib.optionals (!isTorBrowserLike) [ ++ lib.optionals (!isTorBrowserLike) [
"-I${nspr.dev}/include/nspr"
"-I${nss.dev}/include/nss" "-I${nss.dev}/include/nss"
] ]
++ lib.optional stdenv.isDarwin [ ++ lib.optional stdenv.isDarwin [
@ -121,12 +121,15 @@ stdenv.mkDerivation rec {
postPatch = lib.optionalString stdenv.isDarwin '' postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0 substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0
'' + lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) ''
substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h'
''; '';
nativeBuildInputs = nativeBuildInputs =
[ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ]
++ lib.optional gtk3Support wrapGAppsHook ++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ]
++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ]
++ extraNativeBuildInputs; ++ extraNativeBuildInputs;
preConfigure = '' preConfigure = ''

4
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -26,10 +26,10 @@ rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
ffversion = "62.0.3"; ffversion = "63.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0kvb664s47bmmdq2ppjsnyqy8yaiig1xj81r25s36c3i8igfq3zxvws10k2dlmmmrwyc5k4g9i9imgkxj7r3xwwqxc72dl429wvfys8"; sha512 = "095nn50g72l4ihbv26qqqs2jg4ahnmd54vxvm7nxwrnkx901aji7pph6c91zfpf7df26ib1b0pqyir9vsac40sdxc8yrzm6d0lyl1m2";
}; };
patches = nixpkgsPatches ++ [ patches = nixpkgsPatches ++ [

8
pkgs/development/libraries/nss/default.nix
View File

@ -8,11 +8,11 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "nss-${version}"; name = "nss-${version}";
version = "3.38"; version = "3.39";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_3_38_RTM/src/${name}.tar.gz"; url = "mirror://mozilla/security/nss/releases/NSS_3_39_RTM/src/${name}.tar.gz";
sha256 = "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c"; sha256 = "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb";
}; };
buildInputs = [ perl zlib sqlite ] buildInputs = [ perl zlib sqlite ]
@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
preConfigure = "cd nss"; preConfigure = "cd nss";
makeFlags = [ makeFlags = [
"NSPR_INCLUDE_DIR=${nspr.dev}/include/nspr" "NSPR_INCLUDE_DIR=${nspr.dev}/include"
"NSPR_LIB_DIR=${nspr.out}/lib" "NSPR_LIB_DIR=${nspr.out}/lib"
"NSDISTMODE=copy" "NSDISTMODE=copy"
"BUILD_OPT=1" "BUILD_OPT=1"