diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-06-15 20:28:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-06-15 20:29:01 +0200 |
| commit | 791f072384a18a821d998edcecb5d7b3cd78e4ea (patch) | |
| tree | f90b3339375254024c0627fa4805f7270e0d3217 /pkgs/applications/networking/browsers/firefox-bin | |
| parent | 0b5096793c37e27dd8c27b6863005494205a57cd (diff) | |
| download | nixlib-791f072384a18a821d998edcecb5d7b3cd78e4ea.tar nixlib-791f072384a18a821d998edcecb5d7b3cd78e4ea.tar.gz nixlib-791f072384a18a821d998edcecb5d7b3cd78e4ea.tar.bz2 nixlib-791f072384a18a821d998edcecb5d7b3cd78e4ea.tar.lz nixlib-791f072384a18a821d998edcecb5d7b3cd78e4ea.tar.xz nixlib-791f072384a18a821d998edcecb5d7b3cd78e4ea.tar.zst nixlib-791f072384a18a821d998edcecb5d7b3cd78e4ea.zip | |
Merge #26601: thunderbird*: 52.1.1 -> 52.2.0 (security)
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox-bin')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox-bin/update.nix | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index dcb25dc1343a..f59cb402720d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -170,6 +170,10 @@ stdenv.mkDerivation { passthru.ffmpegSupport = true; passthru.updateScript = import ./update.nix { inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl; + baseUrl = + if channel == "devedition" + then "http://archive.mozilla.org/pub/devedition/releases/" + else "http://archive.mozilla.org/pub/firefox/releases/"; }; meta = with stdenv.lib; { description = "Mozilla Firefox, free web browser (binary package)"; diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index 9c29d1288d15..3bcc2ab003c1 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -9,15 +9,10 @@ , gnupg , baseName ? "firefox" , basePath ? "pkgs/applications/networking/browsers/firefox-bin" +, baseUrl }: let - - baseUrl = - if channel == "devedition" - then "http://archive.mozilla.org/pub/devedition/releases/" - else "http://archive.mozilla.org/pub/firefox/releases/"; - isBeta = channel != "release"; |