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: b3a06f10d1e9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 41ce0c2a53df
Choose a head ref
  • 6 commits
  • 4 files changed
  • 2 contributors

Commits on Sep 2, 2019

  1. firefox: support building firefox 69

    @andir
    andir committed Sep 2, 2019
    Copy the full SHA
    f3d3377 View commit details

  2. firefox: 68.0.2 -> 69.0

    @andir
    andir committed Sep 2, 2019
    Copy the full SHA
    77fc386 View commit details

Commits on Sep 3, 2019

  1. firefox-bin: 68.0.2 -> 69.0

    @andir
    andir committed Sep 3, 2019
    Copy the full SHA
    91c7f8b View commit details

Commits on Sep 4, 2019

  1. firefox/wrapper: Set new style override for legacy profiles & allow d… 

    …owngrades

While Firefox 68 started messing with our profiles and required new
profiles on binary location changes Firefox 69 now verifies that we
aren't downgrading to an older Firefox even of the same version. If you
switch between two channel versions and/or between nixpkgs releases
Firefox will refuse to start and demand a fresh profile. Disabling the
downgrade protection works around that issue.
    @andir
    andir committed Sep 4, 2019
    Copy the full SHA
    87e2618 View commit details

  2. firefox-esr: 68.0.2esr -> 68.1.0esr

    @andir
    andir committed Sep 4, 2019
    Copy the full SHA
    6dce809 View commit details

Commits on Sep 7, 2019

  1. Merge #67924: firefox: 68.0.2 -> 69.0

    @vcunat
    vcunat committed Sep 7, 2019
    Copy the full SHA
    41ce0c2 View commit details
746 changes: 373 additions & 373 deletions pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkgs/applications/networking/browsers/firefox/common.nix
View file
Original file line number Diff line number Diff line change
@@ -255,7 +255,7 @@ stdenv.mkDerivation rec {
"--with-libclang-path=${llvmPackages.libclang}/lib"
"--with-clang-path=${llvmPackages.clang}/bin/clang"
]
++ lib.optionals (lib.versionAtLeast ffversion "57") [
++ lib.optionals (lib.versionAtLeast ffversion "57" && lib.versionOlder ffversion "69") [
"--enable-webrender=build"
]

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
@@ -17,10 +17,10 @@ rec {

firefox = common rec {
pname = "firefox";
ffversion = "68.0.2";
ffversion = "69.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "2xzakpb6mp9hjqkim353afv059i4zfpmhflhv3l3qzajgjz36cacbmp4bkn4cghinm8krhp8z02264ww0bcraryjjwn5q0dzljrha2w";
sha512 = "2q0gky7a6ayb6mw8bw3s35q3ggibf7vfyrxgggz1l4lpcv6dwjj01x45071h106jkvnh71hycvp1cywf98lkybjbfp8c9kd8sivkd43";
};

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

firefox-esr-68 = common rec {
pname = "firefox-esr";
ffversion = "68.0.2esr";
ffversion = "68.1.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0dyjayrbcq6dg8vmzbf7303aixnhpd6r777chxpdvqq892rgvw5q4f8yfb6pr8j978hahn4dz968vzmi6sp40y3hf62hnzdqpzd2bx1";
sha512 = "0n8iy9xwf8wldkknq3y3nlm0cmb48baamvz4wmmbpfb2kfrxbsj3wnnd9ayk9zxhrsdq0na9gvkc374mv06nyqijrahd67wljv08fx5";
};

patches = [
2 changes: 2 additions & 0 deletions pkgs/applications/networking/browsers/firefox/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -129,6 +129,8 @@ let
--set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
--set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
--set SNAP_NAME "firefox" \
--set MOZ_LEGACY_PROFILES 1 \
--set MOZ_ALLOW_DOWNGRADE 1 \
${lib.optionalString gdkWayland ''
--set GDK_BACKEND "wayland" \
''}${lib.optionalString (browser ? gtk3)