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.

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

firefox: refactor, add options; tor-browser: package a version directly usable via nix #24733

Closed
wants to merge 5 commits into from

Conversation

oxij
Copy link
Member

@oxij oxij commented Apr 8, 2017

Motivation for this change

I wanted to have options in firefox expression.
Anonymous overlords wanted to have fun and TorBrowser that builds via nix.
We collaborated. It works.

TorBrowser build is not ideal (doesn't have any plugins bundled), but it works!

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
    • Linux (some "not NixOS")
  • 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.

@mention-bot
Copy link

@oxij, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @vcunat and @taku0 to be potential reviewers.

@oxij
Copy link
Member Author

oxij commented Apr 8, 2017

There's absolutely no way for Travis to build this. Takes 4Gb of RAM, 2Gb of disk and half a day to build on my machine.

# requests with your location data to Google (unless you change
# about:config or disable geolocationSupport), but you won't be able
# to geolocate yourself using Google's service. That's right, Mozilla
# and Google care about your privacy.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO this PR could do without the sarcastic remarks at Mozilla's expense...

python = python2;
gnused = gnused_422;
}) firefox-unwrapped firefox-esr-unwrapped;
firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This applies callPackage to something that isn't a package.

, googleAPISupport ? geolocationSupport

# Whenever to send core dumps to Mozilla (via Google server).
, crashreportedSupport ? false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

crashreported -> crashreporter.

@@ -0,0 +1,107 @@
{ lib, callPackage, fetchurl, fetchFromGitHub }:

let common = opts: callPackage (import ./common.nix opts); in
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep common.nix and packages.nix in one file. That keeps life simple.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given the length of both files, I doubt that keeping them together simplifies things, to be honest

@oxij
Copy link
Member Author

oxij commented Apr 16, 2017 via email

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Apr 29, 2017

Fixed? IMHO those remarks are pretty remarkable, because they made me
look at what Firefox sends for "telemetry" with mitm-proxy and gasp a
little.

I'm 100% with you on this but source should be as impartial as possible.

Anyway, updates on this PR? It would really be a shame if this changes went lost. It's a lot better to be able to configure on compile time rather than relying on a ~200 lines userPrefs.js to disable all this nasty stuff.

@oxij
Copy link
Member Author

oxij commented Apr 29, 2017 via email


It will clash with firefox binary if you install both. But its
not a problem since you're running browsers in separate
users/VMs anyway. Right? Right?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re: impartiality: I agree with content, but wouldn't «you should run browsers in separate users/VMs anyway» be better form?

@oxij
Copy link
Member Author

oxij commented Apr 29, 2017 via email

@7c6f434c
Copy link
Member

After some SATA re-seating, my low-power (for a build machine) buildbox has started nox-review pr 24733

@7c6f434c
Copy link
Member

Hm, current master doesn't apply fix-debug.patch to firefox-esr-unwrapped, proposed change does apply it, and patch complains that the patch has apparently been applied upstream.

@oxij
Copy link
Member Author

oxij commented Apr 29, 2017 via email

@7c6f434c
Copy link
Member

Ah OK, thanks for clarification, just wanted to make sure what the rationale for the change is. Dropped the patch.

@oxij
Copy link
Member Author

oxij commented Apr 29, 2017 via email

@7c6f434c
Copy link
Member

7c6f434c commented Apr 29, 2017 via email

@7c6f434c
Copy link
Member

Now let's just close the PR after checking that the build works fine and pushing it to master…

@7c6f434c 7c6f434c closed this Apr 29, 2017
@7c6f434c
Copy link
Member

Ouch. Will have to comment out the torbrowser warning, because it gets shown even for irrelevant evaluations

@oxij
Copy link
Member Author

oxij commented May 1, 2017 via email

@vcunat
Copy link
Member

vcunat commented May 1, 2017

@oxij: nix-env -qa, for example. It's the typical problem for similar warnings.

@7c6f434c
Copy link
Member

7c6f434c commented May 1, 2017

Also, test-eval-release.sh

@oxij
Copy link
Member Author

oxij commented May 1, 2017 via email

@7c6f434c
Copy link
Member

7c6f434c commented May 1, 2017

It is possible that the current discussion of meta checks will result in some mechanism for errors and warnings that are skipped on mass operations…

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Jun 3, 2017

Updates?

@oxij oxij deleted the pkg/firefoxPackages branch August 29, 2017 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants