Branch: refs/heads/release-17.03
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 773822dc09d9a4cedeef424cd17ebd79a0410aa7
      
https://github.com/NixOS/nixpkgs/commit/773822dc09d9a4cedeef424cd17ebd79a0410aa7
  Author: Jan Malakhovski <o...@oxij.org>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    A pkgs/applications/networking/browsers/firefox/common.nix
    R pkgs/applications/networking/browsers/firefox/default.nix

  Log Message:
  -----------
  firefox: rename default.nix -> common.nix

(cherry picked from commit 1d407173b0ddcf995d0dfbf98c936c5f046f8532)


  Commit: 378d10001f72ca3b231af132d405203a524c339a
      
https://github.com/NixOS/nixpkgs/commit/378d10001f72ca3b231af132d405203a524c339a
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M pkgs/applications/networking/browsers/firefox/common.nix
    A pkgs/applications/networking/browsers/firefox/packages.nix
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  firefoxPackages: refactor to a state "close" to master

The point is to support simple version updates via simple
cherry-picking.  The hashes are the same as in the grandparent commit.


  Commit: 9914a7443e2b7ff9c05e98a7a3f740466d124a9a
      
https://github.com/NixOS/nixpkgs/commit/9914a7443e2b7ff9c05e98a7a3f740466d124a9a
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M pkgs/applications/networking/browsers/firefox/wrapper.nix

  Log Message:
  -----------
  wrapFirefox: fix #25505 gtk3 file dialogs

Crash + icons.

(cherry picked from commit 700d6186a30e9e811)
Maybe it's not required ATM, but it shouldn't hurt.


  Commit: d33c4b2b4ab2f664ba9710cabcd1178cd3cac882
      
https://github.com/NixOS/nixpkgs/commit/d33c4b2b4ab2f664ba9710cabcd1178cd3cac882
  Author: Vladimír Čunát <vcu...@gmail.com>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M pkgs/applications/networking/browsers/firefox-bin/sources.nix
    M pkgs/applications/networking/browsers/firefox/packages.nix
    M pkgs/development/libraries/nspr/default.nix
    M pkgs/development/libraries/nss/default.nix

  Log Message:
  -----------
  Merge #26571: firefox* updates (critical security)

(cherry picked from commit 952bb9a445f6af99d9c3509cbf606ca6319097a6)
Yes, finally I could do this simple cherry-pick :-)


Compare: https://github.com/NixOS/nixpkgs/compare/23aa768a873b...d33c4b2b4ab2
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
https://mailman.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to