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

Commits on Jan 8, 2020

  1. firefox: 72.0 -> 72.0.1

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

  2. firefox-esr-68: 68.4.0esr -> 68.4.1esr

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

  3. firefox: fix build of >=72 on aarch64

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

Commits on Jan 9, 2020

  1. Merge pull request #77346 from andir/firefox72 

    firefox: 72.0 -> 72.0.1
    @andir
    andir authored Jan 9, 2020
    Copy the full SHA
    b5feb96 View commit details
Showing with 11 additions and 4 deletions.
  1. +7 −0 pkgs/applications/networking/browsers/firefox/common.nix
  2. +4 −4 pkgs/applications/networking/browsers/firefox/packages.nix
7 changes: 7 additions & 0 deletions pkgs/applications/networking/browsers/firefox/common.nix
View file
Original file line number Diff line number Diff line change
@@ -373,5 +373,12 @@ stdenv.mkDerivation (rec {
# 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") {
# Ideally we would figure out how to tell the build system to not
# care about changed hashes as we are already doing that when we
# fetch the sources. Any further modifications of the source tree
# is on purpose by some of our tool (or by accident and a bug?).
dontFixLibtool = true;

# on aarch64 this is also required
dontUpdateAutotoolsGnuConfigScripts = true;
})
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 = "72.0";
ffversion = "72.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "3ri375myxn040avylz3xdvbgyb0ixn0q1sszrsc4b9jp620j1732qixylw0lyfym5a0vkhpmihbp5kdjrmc4r26myjar5c9zjzisnd0";
sha512 = "37ryimi6yfpcha4c9mcv8gjk38kia1lr5xrj2lglwsr1jai7qxrcd8ljcry8bg87qfwwb9fa13prmn78f5pzpxr7jf8gnsbvr6adxld";
};

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

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

patches = [