From ea8448c90a43cef53e246ad18e4224c58116f19b Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Fri, 16 Feb 2024 22:49:45 +0100
Subject: [PATCH] firefox{,-beta,-devedition,-esr-128}-unwrapped: split into
 sperated files

makes update script work on devedition and beta
---
 .../networking/browsers/firefox/packages.nix  | 125 ------------------
 .../firefox/packages/firefox-beta.nix         |  40 ++++++
 .../firefox/packages/firefox-devedition.nix   |  43 ++++++
 .../firefox/packages/firefox-esr-128.nix      |  40 ++++++
 .../browsers/firefox/packages/firefox.nix     |  41 ++++++
 pkgs/top-level/all-packages.nix               |  12 +-
 6 files changed, 169 insertions(+), 132 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/firefox/packages.nix
 create mode 100644 pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
 create mode 100644 pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
 create mode 100644 pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
 create mode 100644 pkgs/applications/networking/browsers/firefox/packages/firefox.nix

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
deleted file mode 100644
index 8385e3b2f52f..000000000000
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ /dev/null
@@ -1,125 +0,0 @@
-{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests, buildMozillaMach
-, python311
-}:
-
-{
-  firefox = buildMozillaMach rec {
-    pname = "firefox";
-    version = "132.0.2";
-    src = fetchurl {
-      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "9ea95d9fb1a941ac5a5b50da67e224f3ccf8c401f26cb61bb74ad7f4e1e8706d469c4b6325714f2cb9cdf50c32710377d6bca18dd65b55db2c39ef2b27a57fae";
-    };
-
-    extraPatches = [
-    ];
-
-    meta = {
-      changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
-      description = "Web browser built from Firefox source tree";
-      homepage = "http://www.mozilla.com/en-US/firefox/";
-      maintainers = with lib.maintainers; [ lovesegfault hexa ];
-      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;
-      mainProgram = "firefox";
-    };
-    tests = { inherit (nixosTests) firefox; };
-    updateScript = callPackage ./update.nix {
-      attrPath = "firefox-unwrapped";
-    };
-  };
-
-  firefox-beta = buildMozillaMach rec {
-    pname = "firefox-beta";
-    version = "133.0b1";
-    applicationName = "Mozilla Firefox Beta";
-    src = fetchurl {
-      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "c4a85a72b2891c5b6c6e200cd7ef13abe0f5ad090f8ef1d8243a489791f3542b2cd390c141118c4745c4ca677d1e9bf1e564e4a45e066d27ed53e6bd92844727";
-    };
-
-    meta = {
-      changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/";
-      description = "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;
-      mainProgram = "firefox";
-    };
-    tests = { inherit (nixosTests) firefox-beta; };
-    updateScript = callPackage ./update.nix {
-      attrPath = "firefox-beta-unwrapped";
-      versionSuffix = "b[0-9]*";
-    };
-  };
-
-  firefox-devedition = buildMozillaMach rec {
-    pname = "firefox-devedition";
-    version = "133.0b1";
-    applicationName = "Mozilla Firefox Developer Edition";
-    requireSigning = false;
-    branding = "browser/branding/aurora";
-    src = fetchurl {
-      url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "dced4aba71b07b68ee31c283945e7d62a7032f08f5cf71aa261fc7ba32f58277acbe9fdbdd28777d7f4b824e411815b069cab0ce791438088c9ad19c3d2de62e";
-    };
-
-    meta = {
-      changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/";
-      description = "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;
-      mainProgram = "firefox";
-    };
-    tests = { inherit (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-128 = buildMozillaMach rec {
-    pname = "firefox";
-    version = "128.4.0esr";
-    src = fetchurl {
-      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "e720b1f993926d73f5a5727648f753176ac2fd093fb0b71393946bbc5919ce5fc7b88b82960bd1aa427b5663c7f659828dc6702485fc0c1e7a6961571c67faa3";
-    };
-
-    meta = {
-      changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
-      description = "Web browser built from Firefox source tree";
-      homepage = "http://www.mozilla.com/en-US/firefox/";
-      maintainers = with lib.maintainers; [ hexa ];
-      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;
-      mainProgram = "firefox";
-    };
-    tests = { inherit (nixosTests) firefox-esr-128; };
-    updateScript = callPackage ./update.nix {
-      attrPath = "firefox-esr-128-unwrapped";
-      versionPrefix = "128";
-      versionSuffix = "esr";
-    };
-  };
-}
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
new file mode 100644
index 000000000000..a2226073fe21
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -0,0 +1,40 @@
+{
+  stdenv,
+  lib,
+  callPackage,
+  fetchurl,
+  nixosTests,
+  buildMozillaMach,
+}:
+
+buildMozillaMach rec {
+  pname = "firefox-beta";
+  version = "133.0b1";
+  applicationName = "Mozilla Firefox Beta";
+  src = fetchurl {
+    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+    sha512 = "c4a85a72b2891c5b6c6e200cd7ef13abe0f5ad090f8ef1d8243a489791f3542b2cd390c141118c4745c4ca677d1e9bf1e564e4a45e066d27ed53e6bd92844727";
+  };
+
+  meta = {
+    changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/";
+    description = "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;
+    mainProgram = "firefox";
+  };
+  tests = {
+    inherit (nixosTests) firefox-beta;
+  };
+  updateScript = callPackage ./update.nix {
+    attrPath = "firefox-beta-unwrapped";
+    versionSuffix = "b[0-9]*";
+  };
+}
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
new file mode 100644
index 000000000000..0497854f56b4
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -0,0 +1,43 @@
+{
+  stdenv,
+  lib,
+  callPackage,
+  fetchurl,
+  nixosTests,
+  buildMozillaMach,
+}:
+
+buildMozillaMach rec {
+  pname = "firefox-devedition";
+  version = "133.0b1";
+  applicationName = "Mozilla Firefox Developer Edition";
+  requireSigning = false;
+  branding = "browser/branding/aurora";
+  src = fetchurl {
+    url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
+    sha512 = "dced4aba71b07b68ee31c283945e7d62a7032f08f5cf71aa261fc7ba32f58277acbe9fdbdd28777d7f4b824e411815b069cab0ce791438088c9ad19c3d2de62e";
+  };
+
+  meta = {
+    changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/";
+    description = "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;
+    mainProgram = "firefox";
+  };
+  tests = {
+    inherit (nixosTests) firefox-devedition;
+  };
+  updateScript = callPackage ./update.nix {
+    attrPath = "firefox-devedition-unwrapped";
+    versionSuffix = "b[0-9]*";
+    baseUrl = "https://archive.mozilla.org/pub/devedition/releases/";
+  };
+}
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
new file mode 100644
index 000000000000..3fa5c6afc375
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix
@@ -0,0 +1,40 @@
+{
+  stdenv,
+  lib,
+  callPackage,
+  fetchurl,
+  nixosTests,
+  buildMozillaMach,
+}:
+
+buildMozillaMach rec {
+  pname = "firefox";
+  version = "128.4.0esr";
+  src = fetchurl {
+    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+    sha512 = "e720b1f993926d73f5a5727648f753176ac2fd093fb0b71393946bbc5919ce5fc7b88b82960bd1aa427b5663c7f659828dc6702485fc0c1e7a6961571c67faa3";
+  };
+
+  meta = {
+    changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
+    description = "Web browser built from Firefox source tree";
+    homepage = "http://www.mozilla.com/en-US/firefox/";
+    maintainers = with lib.maintainers; [ hexa ];
+    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;
+    mainProgram = "firefox";
+  };
+  tests = {
+    inherit (nixosTests) firefox-esr-128;
+  };
+  updateScript = callPackage ./update.nix {
+    attrPath = "firefox-esr-128-unwrapped";
+    versionPrefix = "128";
+    versionSuffix = "esr";
+  };
+}
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
new file mode 100644
index 000000000000..41da0ebdfce1
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -0,0 +1,41 @@
+{
+  stdenv,
+  lib,
+  callPackage,
+  fetchurl,
+  nixosTests,
+  buildMozillaMach,
+}:
+
+buildMozillaMach rec {
+  pname = "firefox";
+  version = "132.0.2";
+  src = fetchurl {
+    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+    sha512 = "9ea95d9fb1a941ac5a5b50da67e224f3ccf8c401f26cb61bb74ad7f4e1e8706d469c4b6325714f2cb9cdf50c32710377d6bca18dd65b55db2c39ef2b27a57fae";
+  };
+
+  meta = {
+    changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
+    description = "Web browser built from Firefox source tree";
+    homepage = "http://www.mozilla.com/en-US/firefox/";
+    maintainers = with lib.maintainers; [
+      lovesegfault
+      hexa
+    ];
+    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;
+    mainProgram = "firefox";
+  };
+  tests = {
+    inherit (nixosTests) firefox;
+  };
+  updateScript = callPackage ./update.nix {
+    attrPath = "firefox-unwrapped";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 930d24a9eb82..9a7bd7139eb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14136,13 +14136,11 @@ with pkgs;
 
   buildMozillaMach = opts: callPackage (import ../applications/networking/browsers/firefox/common.nix opts) { };
 
-  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-128-unwrapped = firefoxPackages.firefox-esr-128;
-  firefox-esr-unwrapped = firefoxPackages.firefox-esr-128;
+  firefox-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox.nix { };
+  firefox-beta-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox-beta.nix { };
+  firefox-devedition-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox-devedition.nix { };
+  firefox-esr-128-unwrapped = callPackage ../applications/networking/browsers/firefox/packages/firefox-esr-128.nix { };
+  firefox-esr-unwrapped = firefox-esr-128-unwrapped;
 
   firefox = wrapFirefox firefox-unwrapped { };
   firefox-beta = wrapFirefox firefox-beta-unwrapped {