From ce8b255c702e1d0f866dd7498a073ae156453bff Mon Sep 17 00:00:00 2001 From: nodejs-github-bot <18269663+nodejs-github-bot@users.noreply.github.com> Date: Sun, 1 Mar 2026 00:54:49 +0000 Subject: [PATCH 1/3] tools: update nixpkgs-unstable to c0f3d81a7ddbc2b1332be0d8481a672b4f6 --- tools/nix/pkgs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/nix/pkgs.nix b/tools/nix/pkgs.nix index a47c850451d81a..888daa623b703e 100644 --- a/tools/nix/pkgs.nix +++ b/tools/nix/pkgs.nix @@ -1,10 +1,10 @@ arg: let repo = "https://github.com/NixOS/nixpkgs"; - rev = "d1c15b7d5806069da59e819999d70e1cec0760bf"; + rev = "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6"; nixpkgs = import (builtins.fetchTarball { url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "08f0iv9rn4d9ha35kblqpkrgbbnfby87bj8fx1839l3r4grqdnvg"; + sha256 = "0gm6wnh9x7rhzp9akcmg4pjs9k691k6439dahyjb0880bvqgkq9h"; }) arg; in nixpkgs From 489e1e9f7f2fce68f1c684963a83c39d79884294 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sun, 1 Mar 2026 16:28:47 +0100 Subject: [PATCH 2/3] fixup! tools: update nixpkgs-unstable to c0f3d81a7ddbc2b1332be0d8481a672b4f6 --- shell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell.nix b/shell.nix index dabb03e88ff6fe..240d7261a8d4c1 100644 --- a/shell.nix +++ b/shell.nix @@ -72,7 +72,7 @@ let ]) (builtins.attrNames sharedLibDeps); in pkgs.mkShell { - inherit (pkgs.nodejs_latest) nativeBuildInputs; + inherit (pkgs.nodejs-slim_latest) nativeBuildInputs; buildInputs = buildInputs From 9cbc49c02e0381bccdb9d8585cb0857bd20efed9 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 3 Mar 2026 17:35:44 +0100 Subject: [PATCH 3/3] fixup! tools: update nixpkgs-unstable to c0f3d81a7ddbc2b1332be0d8481a672b4f6 --- shell.nix | 2 +- tools/nix/sharedLibDeps.nix | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/shell.nix b/shell.nix index 240d7261a8d4c1..3e91f232a0033b 100644 --- a/shell.nix +++ b/shell.nix @@ -64,7 +64,7 @@ let ++ pkgs.lib.optional (!withSSL) "--without-ssl" ++ pkgs.lib.optional withTemporal "--v8-enable-temporal-support" ++ pkgs.lib.optional (ninja != null) "--ninja" - ++ pkgs.lib.optional loadJSBuiltinsDynamically "--node-builtin-modules-path=${builtins.toString ../..}" + ++ pkgs.lib.optional loadJSBuiltinsDynamically "--node-builtin-modules-path=${builtins.toString ./.}" ++ pkgs.lib.concatMap (name: [ "--shared-${name}" "--shared-${name}-libpath=${pkgs.lib.getLib sharedLibDeps.${name}}/lib" diff --git a/tools/nix/sharedLibDeps.nix b/tools/nix/sharedLibDeps.nix index f38d1ebbeb1ec8..9effe41a67807a 100644 --- a/tools/nix/sharedLibDeps.nix +++ b/tools/nix/sharedLibDeps.nix @@ -49,22 +49,9 @@ // (pkgs.lib.optionalAttrs withSSL ( let version = "3.5.5"; - opensslSrc = "/pkgs/development/libraries/openssl/"; - inherit - (pkgs.callPackage "${ - pkgs.fetchgit { - url = "https://github.com/NixOS/nixpkgs.git"; - rev = "a5b50d31e0fd60227495ad2b2760cbda3581ec77"; - sparseCheckout = [ opensslSrc ]; - nonConeMode = true; - hash = "sha256-Qo3IoUeccGO2GxFSYufyYjZmN5LGSek0z82pN73YXic="; - } - }${opensslSrc}" { }) - openssl_3_6 - ; in { - openssl = openssl_3_6.overrideAttrs (old: { + openssl = pkgs.openssl_3_6.overrideAttrs (old: { inherit version; src = pkgs.fetchurl { url = builtins.replaceStrings [ old.version ] [ version ] old.src.url;