Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e94ecca11dc1
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 096e2f137b64
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on May 8, 2019

  1. firefox-esr-60: 60.6.2esr -> 60.6.3esr 

    (cherry picked from commit 34012380f596e0db66e8cb876756028e363e29bf)
    @andir
    andir committed May 8, 2019
    Copy the full SHA
    48b25d7 View commit details

  2. Merge pull request #61150 from andir/19.03/firefox-esr 

    [19.03] firefox-esr-60: 60.6.2esr -> 60.6.3esr
    @andir
    andir authored May 8, 2019
    Copy the full SHA
    7cdc2d8 View commit details

  3. gcc48, gfortran48: add myself as maintainer 

    cc #61130

(cherry picked from commit bf1818d)
    @veprbl
    veprbl committed May 8, 2019
    Copy the full SHA
    096e2f1 View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 pkgs/applications/networking/browsers/firefox/packages.nix
  2. +1 −1 pkgs/development/compilers/gcc/4.8/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -67,10 +67,10 @@ rec {

firefox-esr-60 = common rec {
pname = "firefox-esr";
ffversion = "60.6.2esr";
ffversion = "60.6.3esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "2gk11kffwmyq3m8dsjc86f7zfagl15msb8byrb4db4w4ssn335wax2p8m221xi4qnzf20fl0p1b30g5z8ivrxx2n19yknnwalazcjzd";
sha512 = "3zg75djd7mbr9alhkp7zqrky7g41apyf6ka0acv500dmpnhvn5v5i0wy9ks8v6vh7kcgw7bngf6msb7vbbps6whwdcqv3v4dqbg6yr2";
};

patches = [
2 changes: 1 addition & 1 deletion pkgs/development/compilers/gcc/4.8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -411,7 +411,7 @@ stdenv.mkDerivation ({
compiler used in the GNU system including the GNU/Linux variant.
'';

maintainers = with stdenv.lib.maintainers; [ peti ];
maintainers = with stdenv.lib.maintainers; [ peti veprbl ];

platforms =
stdenv.lib.platforms.linux ++