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

Commits on Jan 8, 2020

  1. nss: 3.47.1 -> 3.48.1

    @andir
    andir committed Jan 8, 2020
    Copy the full SHA
    6da3b5e View commit details

  2. firefox: prepare for firefox 72

    @andir
    andir committed Jan 8, 2020
    Copy the full SHA
    6d8208e View commit details

  3. firefix-bin: 71.0 -> 72.0

    @andir
    andir committed Jan 8, 2020
    Copy the full SHA
    1064ac9 View commit details

  4. firefox-beta-bin: 72.0b4 -> 73.0b2

    @andir
    andir committed Jan 8, 2020
    Copy the full SHA
    47804d5 View commit details

  5. firefox-devedition-bin: 72.0b11 -> 73.0b2

    @andir
    andir committed Jan 8, 2020
    Copy the full SHA
    a36a912 View commit details

  6. firefox-esr-68: 68.3.0esr -> 68.4.0esr

    @andir
    andir committed Jan 8, 2020
    Copy the full SHA
    2ad59bd View commit details

  7. firefox: 71.0 -> 72.0

    @andir @fpletz
    andir authored and fpletz committed Jan 8, 2020
    Copy the full SHA
    40018e5 View commit details

  8. Merge pull request #77331 from andir/firefox72 

    firefox: 71.0 -> 72.0 (and other firefox packages as well)
    @fpletz
    fpletz authored Jan 8, 2020
    Copy the full SHA
    d01cc96 View commit details
770 changes: 385 additions & 385 deletions pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View file

Large diffs are not rendered by default.

770 changes: 385 additions & 385 deletions pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View file

Large diffs are not rendered by default.

770 changes: 385 additions & 385 deletions pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

Large diffs are not rendered by default.

17 changes: 14 additions & 3 deletions pkgs/applications/networking/browsers/firefox/common.nix
View file
Original file line number Diff line number Diff line change
@@ -110,12 +110,16 @@ let
url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/build-arm-libopus.patch";
sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp";
})
] ++ lib.optional (lib.versionAtLeast ffversion "71") ./fix-ff71-lto.patch
]
++ lib.optional (lib.versionAtLeast ffversion "71") (fetchpatch {
url = "https://phabricator.services.mozilla.com/D56873?download=true";
sha256 = "183949phd2n27nhiq85a04j4fjn0jxmldic6wcjrczsd8g2rrr5k";
})
++ patches;

in

stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
name = "${pname}-unwrapped-${version}";
version = browserVersion;

@@ -363,4 +367,11 @@ stdenv.mkDerivation rec {
inherit browserName;
} // lib.optionalAttrs gtk3Support { inherit gtk3; };

}
} //
# the build system verifies checksums of the bundled rust sources
# ./third_party/rust is be patched by our libtool fixup code in stdenv
# unfortunately we can't just set this to `false` when we do not want it.
# See https://github.com/NixOS/nixpkgs/issues/77289 for more details
lib.optionalAttrs (lib.versionAtLeast ffversion "72") {
dontFixLibtool = true;
})
100 changes: 0 additions & 100 deletions pkgs/applications/networking/browsers/firefox/fix-ff71-lto.patch
View file

This file was deleted.

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
@@ -16,10 +16,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "71.0";
ffversion = "72.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "0hfjlhwdhfdfzd27d6p3h8ff5m2jphlaipv4zym48bn6g95if1x98q2lb87617bxfm31di4rckjvqb70g9sm3smil6p6bnw2dsvnq1g";
sha512 = "3ri375myxn040avylz3xdvbgyb0ixn0q1sszrsc4b9jp620j1732qixylw0lyfym5a0vkhpmihbp5kdjrmc4r26myjar5c9zjzisnd0";
};

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

firefox-esr-68 = common rec {
pname = "firefox-esr";
ffversion = "68.3.0esr";
ffversion = "68.4.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "31zisy4l07hhm9yvxz7sx04kz1f5rl20z1w072jxaabi42sw07xr6lcflv88gwl21y902n7vwd1q1zfavpnipn65wap4i0vm8c4m6pr";
sha512 = "29h0fm929jrk9nbb40bajf6a6s4x9w8zc2qw1hrg5jki1pabx30wdgn372pb51ak371a0q59k8p1vab6j31q7par6xvpwh7aiydfq04";
};

patches = [
4 changes: 2 additions & 2 deletions pkgs/development/libraries/nss/default.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.47.1";
version = "3.48";
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 = "1yx68a1ks63s8914zmiz9h1nh0261aqzcblgg1cb4ig33p5x3qqs";
sha256 = "1b7qs1q7jqhw9dvkdznanzhc5dyq4bwx0biywszy3qx4hqm8571z";
};

depsBuildBuild = [ buildPackages.stdenv.cc ];