Merge pull request #222701 from jopejoe1/firefox (e56ea3c3) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+7 −0

Original line number	Diff line number	Diff line
		@@ -7433,6 +7433,13 @@
		githubId = 7673602;
		name = "Jonathan Ringer";
		};
		jopejoe1 = {
		email = "johannes@joens.email";
		matrix = "@jopejoe1:matrix.org";
		github = "jopejoe1";
		githubId = 34899572;
		name = "Johannes Jöns";
		};
		jordanisaacs = {
		name = "Jordan Isaacs";
		email = "nix@jdisaacs.com";

nixos/tests/all-tests.nix

+2 −0

Original line number	Diff line number	Diff line
		@@ -221,6 +221,8 @@ in {
		fenics = handleTest ./fenics.nix {};
		ferm = handleTest ./ferm.nix {};
		firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; };
		firefox-beta = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-beta; };
		firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; };
		firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job
		firefox-esr-102 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-102; };
		firejail = handleTest ./firejail.nix {};

pkgs/applications/networking/browsers/firefox/common.nix

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		, binaryName ? "firefox"
		, application ? "browser"
		, applicationName ? "Mozilla Firefox"
		, branding ? null
		, src
		, unpackPhase ? null
		, extraPatches ? []
		@@ -390,6 +391,7 @@ buildStdenv.mkDerivation ({
		]
		++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ]
		++ lib.optional enableOfficialBranding "--enable-official-branding"
		++ lib.optional (branding != null) "--with-branding=${branding}"
		++ extraConfigureFlags;

		buildInputs = [

pkgs/applications/networking/browsers/firefox/packages.nix

+56 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,62 @@ rec {
		};
		};

		firefox-beta = buildMozillaMach rec {
		pname = "firefox-beta";
		version = "112.0b6";
		applicationName = "Mozilla Firefox Beta";
		src = fetchurl {
		url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
		sha512 = "sha512-3Ae3IilmvG7twTaFnKs0TJpiuzLERdrjToTmE644VFeK2GpRgaXgFRfsSB32cyAE+zXPYN/fub8sUoPAHLMbvg==";
		};

		meta = {
		description = "A web browser built from Firefox Beta Release source tree";
		homepage = "http://www.mozilla.com/en-US/firefox/";
		maintainers = with lib.maintainers; [ jopejoe1 ];
		platforms = lib.platforms.unix;
		badPlatforms = lib.platforms.darwin;
		broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
		# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
		maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
		license = lib.licenses.mpl20;
		};
		tests = [ nixosTests.firefox-beta ];
		updateScript = callPackage ./update.nix {
		attrPath = "firefox-beta-unwrapped";
		versionSuffix = "b[0-9]*";
		};
		};

		firefox-devedition = buildMozillaMach rec {
		pname = "firefox-devedition";
		version = "112.0b6";
		applicationName = "Mozilla Firefox Developer Edition";
		branding = "browser/branding/aurora";
		src = fetchurl {
		url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
		sha512 = "sha512-UJjZ4HFaO6XUpFt+d61KXdliN3FW0BDHFpwt4f6/pv6Rv10mxeRUnGKZDomoLwv+yCgN3EKDZ+iPA9FzkLxZCQ==";
		};

		meta = {
		description = "A web browser built from Firefox Developer Edition source tree";
		homepage = "http://www.mozilla.com/en-US/firefox/";
		maintainers = with lib.maintainers; [ jopejoe1 ];
		platforms = lib.platforms.unix;
		badPlatforms = lib.platforms.darwin;
		broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
		# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
		maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
		license = lib.licenses.mpl20;
		};
		tests = [ nixosTests.firefox-devedition ];
		updateScript = callPackage ./update.nix {
		attrPath = "firefox-devedition-unwrapped";
		versionSuffix = "b[0-9]*";
		baseUrl = "https://archive.mozilla.org/pub/devedition/releases/";
		};
		};

		firefox-esr-102 = buildMozillaMach rec {
		pname = "firefox-esr-102";
		version = "102.9.0esr";

pkgs/top-level/all-packages.nix

+4 −0

Original line number	Diff line number	Diff line
		@@ -30048,10 +30048,14 @@ with pkgs;
		firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {});

		firefox-unwrapped = firefoxPackages.firefox;
		firefox-beta-unwrapped = firefoxPackages.firefox-beta;
		firefox-devedition-unwrapped = firefoxPackages.firefox-devedition;
		firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102;
		firefox-esr-unwrapped = firefoxPackages.firefox-esr-102;

		firefox = wrapFirefox firefox-unwrapped { };
		firefox-beta = wrapFirefox firefox-beta-unwrapped { };
		firefox-devedition = wrapFirefox firefox-devedition-unwrapped { };

		firefox-esr = firefox-esr-102;
		firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { };

Admin message