diff options
| author | taku0 <mxxouy6x3m_github@tatapa.org> | 2019-07-14 14:54:55 +0900 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2019-07-14 22:51:14 +0200 |
| commit | 75d4e64fad0c917f7e7aab8c4bbbe311b8064fba (patch) | |
| tree | e84c8ca605140f63d093226f75c10e0f269fa29a | |
| parent | 0c436f8ca153f06e05e3e2780322a064e6e2697d (diff) | |
| download | nixlib-75d4e64fad0c917f7e7aab8c4bbbe311b8064fba.tar nixlib-75d4e64fad0c917f7e7aab8c4bbbe311b8064fba.tar.gz nixlib-75d4e64fad0c917f7e7aab8c4bbbe311b8064fba.tar.bz2 nixlib-75d4e64fad0c917f7e7aab8c4bbbe311b8064fba.tar.lz nixlib-75d4e64fad0c917f7e7aab8c4bbbe311b8064fba.tar.xz nixlib-75d4e64fad0c917f7e7aab8c4bbbe311b8064fba.tar.zst nixlib-75d4e64fad0c917f7e7aab8c4bbbe311b8064fba.zip | |
firefox-esr: 60.7.2esr -> 68.0esr
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 26 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 90cd526897aa..b7fd775a6754 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -71,6 +71,7 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; ffversion = "60.7.2esr"; + src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; sha512 = "0mw5dgrxd5vj6cngd9v3dy6hzdsg82s0cs9fabhrzrl1dy3pqdkccqqnj9r0hxwmcrdgca3s35i5lwwmlljagq6nyb5q6qv4fzv0n0j"; @@ -96,6 +97,28 @@ rec { }; }; + firefox-esr-68 = common rec { + pname = "firefox-esr"; + ffversion = "68.0esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; + sha512 = "29iqxxwkz2zgk2ppgq05w0bhs8c0938gina5s8brmwn6zn15nv379pa82a9djpzjryl6c5ff0hk0z7gx6n3xvf7w7ky9010h9il0kbg"; + }; + + patches = [ + ./no-buildconfig-ffx65.patch + ]; + + meta = firefox.meta // { + description = "A web browser built from Firefox Extended Support Release source tree"; + }; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-68-unwrapped"; + versionSuffix = "esr"; + versionKey = "ffversion"; + }; + }; + } // (let iccommon = args: common (args // { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b56dbe6c156..d6decd65d924 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18080,6 +18080,7 @@ in firefox-unwrapped = firefoxPackages.firefox; firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52; firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60; + firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68; tor-browser-unwrapped = firefoxPackages.tor-browser; icecat-unwrapped = firefoxPackages.icecat; @@ -18087,7 +18088,8 @@ in firefox-wayland = wrapFirefox firefox-unwrapped { gdkWayland = true; }; firefox-esr-52 = wrapFirefox firefox-esr-52-unwrapped { }; firefox-esr-60 = wrapFirefox firefox-esr-60-unwrapped { }; - firefox-esr = firefox-esr-60; + firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { }; + firefox-esr = firefox-esr-68; icecat = wrapFirefox icecat-unwrapped { }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { |