Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

firefox: enable official branding #34463

Merged
merged 1 commit into from Feb 1, 2018
Merged

firefox: enable official branding #34463

merged 1 commit into from Feb 1, 2018

Conversation

andir
Copy link
Member

@andir andir commented Jan 31, 2018

As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
#31843 (comment) we
should 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.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

pbogdan referenced this pull request in NixOS/ofborg Jan 31, 2018
@grahamc
specify supportedPlatforms to allow aarch64 tests
8eb0760
@grahamc
Copy link
Member

grahamc commented Jan 31, 2018

I introduced a failure in the evaluator today, sorry about that. Testing for a fix:

@GrahamcOfBorg eval

@garbas
Copy link
Member

garbas commented Jan 31, 2018

@andir thank you for starting the work on this.

I think better option would be to set enableOfficialBranding to true (here. Then everything using common.nix would be branded officially (firefox, firefox-esr, ...)

@grahamc
Copy link
Member

grahamc commented Jan 31, 2018

When you change the default to true, please put this part in the code itself, as a comment:

As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we
should 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.

@grahamc
Copy link
Member

grahamc commented Jan 31, 2018

also, nit, it isn't that we should have permission, we do have permission :)

@andir
Copy link
Member Author

andir commented Feb 1, 2018

I've changed the PR as suggested. Please review once more @grahamc @garbas

@andir
firefox: enable official branding
3a4e7e6 
As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
NixOS#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.
@garbas garbas merged commit ce08581 into NixOS:master Feb 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@garbas garbas garbas approved these changes

@grahamc grahamc grahamc approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@andir @grahamc @garbas @GrahamcOfBorg