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

[17.09] firefox branding #34838

Merged
merged 1 commit into from Feb 11, 2018
Merged

[17.09] firefox branding #34838

merged 1 commit into from Feb 11, 2018

Conversation

andir
Copy link
Member

@andir andir commented Feb 11, 2018 •
edited

Motivation for this change

Since we enabled official branding on master we might as well do it on the stable release. A much nicer icon will then appear on many peoples desktop 🎉

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.

@andir
firefox: enable official branding
ad7fd69 
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.

(cherry picked from commit ce08581 &
discussed at NixOS#31843 (comment))
@vcunat
Copy link
Member

vcunat commented Feb 11, 2018

@GrahamcOfBorg build firefox firefox-esr

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

error: while evaluating the attribute 'buildCommand' of the derivation 'firefox-58.0.1' at /var/lib/gc-of-borg/nix-test-rs-2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-2/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating the attribute 'nativeBuildInputs' of the derivation 'firefox-unwrapped-58.0.1' at /var/lib/gc-of-borg/nix-test-rs-2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-2/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating the attribute 'installPhase' of the derivation 'cargo-binary-1.21.0' at /var/lib/gc-of-borg/nix-test-rs-2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-2/pkgs/stdenv/generic/make-derivation.nix:98:11:
while evaluating the attribute 'installPhase' of the derivation 'rustc-binary-1.21.0' at /var/lib/gc-of-borg/nix-test-rs-2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-2/pkgs/stdenv/generic/make-derivation.nix:98:11:
missing bootstrap url for platform aarch64-linux

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘firefox-unwrapped-58.0.1’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/applications/networking/browsers/firefox/packages.nix:19 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@vcunat
Copy link
Member

vcunat commented Feb 11, 2018

Hmm, x86_64-linux builds could be tested by myself :-/

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/lkjza0y2q0hqhklbn0a8wcxw6z5xyn7x-firefox-esr-unwrapped-52.6.0esr/lib/firefox-52.6.0/libmozsandbox.so
stripping (with flags -S) in /nix/store/lkjza0y2q0hqhklbn0a8wcxw6z5xyn7x-firefox-esr-unwrapped-52.6.0esr/lib  /nix/store/lkjza0y2q0hqhklbn0a8wcxw6z5xyn7x-firefox-esr-unwrapped-52.6.0esr/bin
patching script interpreter paths in /nix/store/lkjza0y2q0hqhklbn0a8wcxw6z5xyn7x-firefox-esr-unwrapped-52.6.0esr
/nix/store/lkjza0y2q0hqhklbn0a8wcxw6z5xyn7x-firefox-esr-unwrapped-52.6.0esr/lib/firefox-52.6.0/run-mozilla.sh: interpreter directive changed from "/bin/sh" to "/nix/store/jgw8hxx7wzkyhb2dr9hwsd9h2caaasdc-bash-4.4-p12/bin/sh"
checking for references to /build in /nix/store/lkjza0y2q0hqhklbn0a8wcxw6z5xyn7x-firefox-esr-unwrapped-52.6.0esr...
running install tests
Mozilla Firefox 52.6.0
building '/nix/store/0sz1fw0q5sksl5pfc7c4qpvlsxxnxznv-firefox-52.6.0esr.drv'...
/nix/store/ispanz1jkn17ya7941c7jijvm8s66520-firefox-58.0.1
/nix/store/2npfb8bhncjn01mwnaqssd85n5b62fli-firefox-52.6.0esr

@andir andir merged commit 3389f23 into NixOS:release-17.09 Feb 11, 2018
@andir andir deleted the 17.09/firefox-branding branch February 11, 2018 12:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
3 participants
@andir @vcunat @GrahamcOfBorg