From d0e8dd3bdabf2ef8bd0ee59a1fbf88c2bbcfcb25 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 29 Jun 2026 10:54:00 -0400 Subject: [PATCH] spidermonkey_115: drop Also removes all conditionals from `common.nix` that checked for version < 128, which is now our baseline version --- .../interpreters/spidermonkey/115.nix | 4 - ...nspr-and-icu-on-bootstrapped-sysroot.patch | 40 --------- .../always-check-for-pkg-config.patch | 23 ------ .../interpreters/spidermonkey/common.nix | 81 ++++++++----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 6 files changed, 35 insertions(+), 116 deletions(-) delete mode 100644 pkgs/development/interpreters/spidermonkey/115.nix delete mode 100644 pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch delete mode 100644 pkgs/development/interpreters/spidermonkey/always-check-for-pkg-config.patch diff --git a/pkgs/development/interpreters/spidermonkey/115.nix b/pkgs/development/interpreters/spidermonkey/115.nix deleted file mode 100644 index 43e85b3a2235..000000000000 --- a/pkgs/development/interpreters/spidermonkey/115.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "115.28.0"; - hash = "sha512-lnfF4YA/aGV9GKTlsmXsjqiL/J778qbEKQuTW/PG7jsMMcp4ACacAmxRISKvw2MPmCFd7JYzNvJhpXNDK6umnw=="; -} diff --git a/pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch b/pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch deleted file mode 100644 index 29966d90864d..000000000000 --- a/pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a26bb162d9403138d64b84e8fa4f0471084c45b2 Mon Sep 17 00:00:00 2001 -From: "Kirill A. Korinsky" -Date: Fri, 8 Jul 2022 21:21:25 +0200 -Subject: [PATCH] Allow system's nspr and icu on bootstrapped sysroot - -This patch partially reverts https://github.com/mozilla/gecko-dev/commit/9aa3587bbf0416dd2eb5b614f7b301c71c64286b ---- - build/moz.configure/nspr.configure | 2 +- - js/moz.configure | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/moz.configure/nspr.configure b/build/moz.configure/nspr.configure -index 06f03d9bc72d..9687c84a7290 100644 ---- a/build/moz.configure/nspr.configure -+++ b/build/moz.configure/nspr.configure -@@ -19,7 +19,7 @@ def enable_nspr_build(enable): - return enable - - --system_lib_option("--with-system-nspr", help="Use system NSPR") -+option("--with-system-nspr", help="Use system NSPR") - - - @depends(enable_nspr_build, "--with-system-nspr", js_standalone) -diff --git a/js/moz.configure b/js/moz.configure -index b7ba9790425d..5ff5cb2da266 100644 ---- a/js/moz.configure -+++ b/js/moz.configure -@@ -1129,7 +1129,7 @@ set_define( - - # ECMAScript Internationalization API Support (uses ICU) - # ====================================================== --system_lib_option("--with-system-icu", help="Use system ICU") -+option("--with-system-icu", help="Use system ICU") - - system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 71.1", when="--with-system-icu") - --- -2.37.0 - diff --git a/pkgs/development/interpreters/spidermonkey/always-check-for-pkg-config.patch b/pkgs/development/interpreters/spidermonkey/always-check-for-pkg-config.patch deleted file mode 100644 index c6e43b60aa59..000000000000 --- a/pkgs/development/interpreters/spidermonkey/always-check-for-pkg-config.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9d3f6e9ff5e66af90a5d187d902f7893fb91c24b Mon Sep 17 00:00:00 2001 -From: "Kirill A. Korinsky" -Date: Fri, 1 Jul 2022 12:23:37 +0200 -Subject: [PATCH] Always check for pkg-config - ---- - build/moz.configure/pkg.configure | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/build/moz.configure/pkg.configure b/build/moz.configure/pkg.configure -index 6b460ae174eed..0056ecd7ae2d8 100644 ---- a/build/moz.configure/pkg.configure -+++ b/build/moz.configure/pkg.configure -@@ -15,8 +15,7 @@ pkg_config = check_prog( - pkg_config, - bootstrap=depends(when=target_sysroot.bootstrapped)(lambda: "pkgconf"), - allow_missing=True, -- when=compile_environment -- & depends(target.os)(lambda os: os not in ("WINNT", "OSX", "Android")), -+ when=compile_environment, - ) - - diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index dd4bfcb45b7d..016eafa6b281 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -48,32 +48,26 @@ stdenv.mkDerivation (finalAttrs: { inherit hash; }; - patches = - lib.optionals (lib.versionOlder version "128") [ - # use pkg-config at all systems - ./always-check-for-pkg-config.patch - ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch - ] - ++ lib.optionals (lib.versionAtLeast version "128") [ - # rebased version of the above 2 patches - ./always-check-for-pkg-config-128.patch - ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot-128.patch - ] - ++ lib.optionals (stdenv.hostPlatform.system == "i686-linux") [ - # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 - ./fix-float-i686.patch - ] - ++ lib.optionals (lib.versionAtLeast version "140") [ - # mozjs-140.pc does not contain -DXP_UNIX on Linux - # https://bugzilla.mozilla.org/show_bug.cgi?id=1973994 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch"; - hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU="; - }) - ] - ++ lib.optionals (lib.versionAtLeast version "140" && stdenv.hostPlatform.is32bit) [ - ./fix-32bit-build.patch - ]; + patches = [ + # use pkg-config for all systems + ./always-check-for-pkg-config-128.patch + ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot-128.patch + ] + ++ lib.optionals (stdenv.hostPlatform.system == "i686-linux") [ + # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 + ./fix-float-i686.patch + ] + ++ lib.optionals (lib.versionAtLeast version "140") [ + # mozjs-140.pc does not contain -DXP_UNIX on Linux + # https://bugzilla.mozilla.org/show_bug.cgi?id=1973994 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch"; + hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU="; + }) + ] + ++ lib.optionals (lib.versionAtLeast version "140" && stdenv.hostPlatform.is32bit) [ + ./fix-32bit-build.patch + ]; nativeBuildInputs = [ cargo @@ -85,8 +79,6 @@ stdenv.mkDerivation (finalAttrs: { rustc.llvmPackages.llvm # for llvm-objdump which zip - ] - ++ lib.optionals (lib.versionAtLeast version "128") [ rust-cbindgen rustPlatform.bindgenHook ]; @@ -147,23 +139,20 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - preConfigure = - lib.optionalString (lib.versionAtLeast version "128") '' - export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild - '' - + '' - export LIBXUL_DIST=$out - export PYTHON="${buildPackages.python3.interpreter}" - export M4=m4 - export AWK=awk - export AS=$CC - export AC_MACRODIR=$PWD/build/autoconf/ - patchShebangs build/cargo-linker - # We can't build in js/src/, so create a build dir - mkdir obj - cd obj/ - configureScript=../js/src/configure - ''; + preConfigure = '' + export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild + export LIBXUL_DIST=$out + export PYTHON="${buildPackages.python3.interpreter}" + export M4=m4 + export AWK=awk + export AS=$CC + export AC_MACRODIR=$PWD/build/autoconf/ + patchShebangs build/cargo-linker + # We can't build in js/src/, so create a build dir + mkdir obj + cd obj/ + configureScript=../js/src/configure + ''; env = lib.optionalAttrs (lib.versionAtLeast version "140") { # '-Wformat-security' ignored without '-Wformat' @@ -189,8 +178,6 @@ stdenv.mkDerivation (finalAttrs: { catap bobby285271 ]; - # ERROR: Failed to find an adequate linker - broken = lib.versionOlder version "128" && stdenv.hostPlatform.isDarwin; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ec0410759418..e523a6796170 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2097,6 +2097,7 @@ mapAliases { spectrojack = throw "'spectrojack' was remove due to lack of upstream maintenance and relying on gtk2"; # Added 2025-12-02 speed_dreams = speed-dreams; # Added 2026-01-19 spidermonkey_91 = throw "'spidermonkey_91 is EOL since 2022/09"; # Added 2025-08-26 + spidermonkey_115 = throw "'spidermonkey_115 is EOL since 2024/09"; # Added 2026-07-06 spoof = throw "'spoof' has been removed, as it is broken with the latest MacOS versions and is unmaintained upstream"; # Added 2025-11-14 spotify-unwrapped = throw "'spotify-unwrapped' has been renamed to/replaced by 'spotify'"; # Converted to throw 2025-10-27 spring = throw "spring has been removed, as it had been broken since 2023 (it was a game; maybe you’re thinking of spring-boot-cli?)"; # Added 2025-09-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdbd50d537e5..769c0e6cbebc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4722,11 +4722,9 @@ with pkgs; inherit ({ - spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix { }; spidermonkey_128 = callPackage ../development/interpreters/spidermonkey/128.nix { }; spidermonkey_140 = callPackage ../development/interpreters/spidermonkey/140.nix { }; }) - spidermonkey_115 spidermonkey_128 spidermonkey_140 ;