diff options
| author | taku0 <mxxouy6x3m_github@tatapa.org> | 2020-07-27 21:14:14 +0900 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-09-29 11:52:50 +0000 |
| commit | 4e44f66a0c87afa887d4eb427236e4e521d744dd (patch) | |
| tree | 36d438a8d29a27b1dfe2cce184342ce477bf9059 /nixpkgs | |
| parent | 0dfd6f3922a900d3764e06696fb5f34053026022 (diff) | |
| download | nixlib-4e44f66a0c87afa887d4eb427236e4e521d744dd.tar nixlib-4e44f66a0c87afa887d4eb427236e4e521d744dd.tar.gz nixlib-4e44f66a0c87afa887d4eb427236e4e521d744dd.tar.bz2 nixlib-4e44f66a0c87afa887d4eb427236e4e521d744dd.tar.lz nixlib-4e44f66a0c87afa887d4eb427236e4e521d744dd.tar.xz nixlib-4e44f66a0c87afa887d4eb427236e4e521d744dd.tar.zst nixlib-4e44f66a0c87afa887d4eb427236e4e521d744dd.zip | |
firefox-esr: 68.10.0esr -> 78.1.0esr
(cherry picked from commit 1d730e16290fd980cbe07a760b6065f1e8d3b71a)
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix | 28 | ||||
| -rw-r--r-- | nixpkgs/pkgs/top-level/all-packages.nix | 6 |
2 files changed, 32 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index b6ba2317da3a..69ede584339f 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -29,6 +29,34 @@ rec { }; }; + firefox-esr-78 = firefoxCommon rec { + pname = "firefox-esr"; + ffversion = "78.1.0esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; + sha512 = "223v796vjsvgs3yw442c8qbsbh43l1aniial05rl70hx44rh9sg108ripj8q83p5l9m0sp67x6ixd2xvifizv6461a1zra1rvbb1caa"; + }; + + patches = [ + ./no-buildconfig-ffx76.patch + ]; + + meta = { + description = "A web browser built from Firefox Extended Support Release source tree"; + homepage = "http://www.mozilla.com/en-US/firefox/"; + maintainers = with lib.maintainers; [ eelco andir ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + license = lib.licenses.mpl20; + }; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-78-unwrapped"; + versionKey = "ffversion"; + }; + }; + firefox-esr-68 = (firefoxCommon rec { pname = "firefox-esr"; ffversion = "68.10.0esr"; diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index 47ec21cc9f40..2c6dcae66f06 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -19782,12 +19782,14 @@ in firefox-unwrapped = firefoxPackages.firefox; firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68; - firefox-esr-unwrapped = firefox-esr-60-unwrapped; + firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78; + firefox-esr-unwrapped = firefox-esr-78-unwrapped; firefox-beta-unwrapped = firefoxPackages.firefox-beta; firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { }; - firefox-esr = firefox-esr-68; + firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { }; + firefox-esr = firefox-esr-78; firefox-beta = wrapFirefox firefox-beta-unwrapped { }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { |