From 4acde7282a63863a21f297da0f0db4c643deac58 Mon Sep 17 00:00:00 2001 From: dish Date: Mon, 25 Aug 2025 19:29:13 -0400 Subject: [PATCH] couchdb: use quickjs instead of spidermonkey Allows us to drop spidermonkey_91, which reached EOL years ago. We won't switch to the latest supported spidermonkey version for couchdb(128) because as of commit its support ends in 3 weeks, so there would be no use trying to update it again after this. Better to just switch now and avoid pain in the future. --- pkgs/servers/http/couchdb/3.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/http/couchdb/3.nix b/pkgs/servers/http/couchdb/3.nix index 50d1d63a9825..afddb8344784 100644 --- a/pkgs/servers/http/couchdb/3.nix +++ b/pkgs/servers/http/couchdb/3.nix @@ -5,7 +5,6 @@ erlang, icu, openssl, - spidermonkey_91, python3, nixosTests, }: @@ -20,8 +19,6 @@ stdenv.mkDerivation rec { }; postPatch = '' - substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-91' "${spidermonkey_91.dev}/include/mozjs-91" - substituteInPlace configure --replace '/usr/include/''${SM_HEADERS}' "${spidermonkey_91.dev}/include/mozjs-91" patchShebangs bin/rebar '' + lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -37,14 +34,14 @@ stdenv.mkDerivation rec { buildInputs = [ icu openssl - spidermonkey_91 (python3.withPackages (ps: with ps; [ requests ])) ]; dontAddPrefix = "True"; configureFlags = [ - "--spidermonkey-version=91" + "--js-engine=quickjs" + "--disable-spidermonkey" ]; buildFlags = [