Skip to content
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
base: 09db9a7873b0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 3389f2341287
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Feb 11, 2018

  1. firefox: enable official branding 

    As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
#31843 (comment) we
have permission to use the official firefox branding.

Fur purposes of documentation the statement of @sylvestre:
> As the person who did part of the work described in the LWN article
> and release manager working for Mozilla, I can confirm the statement
> that I made in
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815006
>
> @garbas shared with me the list of patches applied for the Nix package.
> As they are just for portability and tiny modifications, they don't
> alter the experience of the product. In parallel, Rok also shared the
> build options. They seem good (even if I cannot judge the quality of the
> packaging of the underlying dependencies like sqlite, png, etc).
> Therefor, as long as you keep the patch queue sane and you don't alter
> the experience of Firefox users, you won't have any issues using the
> official branding.

(cherry picked from commit ce08581 &
discussed at #31843 (comment))
    @andir
    andir committed Feb 11, 2018
    Copy the full SHA
    ad7fd69 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #34838 from andir/17.09/firefox-branding 

    [17.09] firefox branding
    @andir
    andir committed Feb 11, 2018
    Copy the full SHA
    3389f23 View commit details
    Browse the repository at this point in the history