Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 02fb26136c72
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d17ab805fd8d
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 23, 2018

  1. nss: 3.38 -> 3.39

    @andir
    andir committed Oct 23, 2018
    Copy the full SHA
    8a9b6bc View commit details

  2. firefox: 62.0.3 -> 63.0

    @andir
    andir committed Oct 23, 2018
    Copy the full SHA
    277da59 View commit details

  3. firefox-bin: 62.0.3 -> 63.0

    @andir
    andir committed Oct 23, 2018
    Copy the full SHA
    5137c04 View commit details

Commits on Oct 25, 2018

  1. Merge pull request #48862 from andir/firefox 

    firefox{,bin}: 62.0.3 -> 63.0 & nss: 3.38-> 3.39
    @andir
    andir authored Oct 25, 2018
    Copy the full SHA
    d17ab80 View commit details
794 changes: 397 additions & 397 deletions pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion pkgs/applications/networking/browsers/firefox/common.nix
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@
, hunspell, libevent, libstartup_notification, libvpx
, icu, libpng, jemalloc, glib
, autoconf213, which, gnused, cargo, rustc, llvmPackages
, rust-cbindgen, nodejs
, debugBuild ? false

### optionals
@@ -111,7 +112,6 @@ stdenv.mkDerivation rec {
"-I${glib.dev}/include/gio-unix-2.0"
]
++ lib.optionals (!isTorBrowserLike) [
"-I${nspr.dev}/include/nspr"
"-I${nss.dev}/include/nss"
]
++ lib.optional stdenv.isDarwin [
@@ -121,12 +121,15 @@ stdenv.mkDerivation rec {

postPatch = lib.optionalString stdenv.isDarwin ''
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 =
[ autoconf213 which gnused pkgconfig perl python2 cargo rustc ]
++ lib.optional gtk3Support wrapGAppsHook
++ lib.optionals stdenv.isDarwin [ xcbuild rsync ]
++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ]
++ extraNativeBuildInputs;

preConfigure = ''
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
@@ -26,10 +26,10 @@ rec {

firefox = common rec {
pname = "firefox";
ffversion = "62.0.3";
ffversion = "63.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0kvb664s47bmmdq2ppjsnyqy8yaiig1xj81r25s36c3i8igfq3zxvws10k2dlmmmrwyc5k4g9i9imgkxj7r3xwwqxc72dl429wvfys8";
sha512 = "095nn50g72l4ihbv26qqqs2jg4ahnmd54vxvm7nxwrnkx901aji7pph6c91zfpf7df26ib1b0pqyir9vsac40sdxc8yrzm6d0lyl1m2";
};

patches = nixpkgsPatches ++ [
8 changes: 4 additions & 4 deletions pkgs/development/libraries/nss/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ let

in stdenv.mkDerivation rec {
name = "nss-${version}";
version = "3.38";
version = "3.39";

src = fetchurl {
url = "mirror://mozilla/security/nss/releases/NSS_3_38_RTM/src/${name}.tar.gz";
sha256 = "0qigcy3d169cf67jzv3rbai0m6dn34vp8h2z696mz4yn10y3sr1c";
url = "mirror://mozilla/security/nss/releases/NSS_3_39_RTM/src/${name}.tar.gz";
sha256 = "0jw6qlfl2g47hhx056nvnj6h92bk3sn46hy3ig61a911dzblvrkb";
};

buildInputs = [ perl zlib sqlite ]
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
preConfigure = "cd nss";

makeFlags = [
"NSPR_INCLUDE_DIR=${nspr.dev}/include/nspr"
"NSPR_INCLUDE_DIR=${nspr.dev}/include"
"NSPR_LIB_DIR=${nspr.out}/lib"
"NSDISTMODE=copy"
"BUILD_OPT=1"