From a1c1180ac8e7f7201ec615e62653ec33aed7f0b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 20:18:38 +0000 Subject: [PATCH 1/2] libuv: 1.48.0 -> 1.49.2 --- pkgs/development/libraries/libuv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 7f9aac48e725..86e4800d41fc 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -23,14 +23,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.48.0"; + version = "1.49.2"; pname = "libuv"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${finalAttrs.version}"; - hash = "sha256-U68BmIQNpmIy3prS7LkYl+wvDJQNikoeFiKh50yQFoA="; + hash = "sha256-hNXW3cQVW8VGMQrHFkezRI2OqYF7Qf1riD8sHy66qxg="; }; outputs = [ "out" "dev" ]; From 982e3fc31d8f83e1f6792e5cfe0af21881a2c801 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 3 Nov 2024 04:31:21 +0100 Subject: [PATCH 2/2] nodejs_23: drop reverts --- pkgs/development/web/nodejs/v23.nix | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/pkgs/development/web/nodejs/v23.nix b/pkgs/development/web/nodejs/v23.nix index 2039e9385c4f..9a390e9d1814 100644 --- a/pkgs/development/web/nodejs/v23.nix +++ b/pkgs/development/web/nodejs/v23.nix @@ -24,29 +24,5 @@ buildNodejs { ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch - - # Those reverts are due to a mismatch with the libuv version used upstream - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/dcbc5fbe65b068a90c3d0970155d3a68774caa38.patch?full_index=1"; - hash = "sha256-Q7YrooolMjsGflTQEj5ra6hRVGhMP6APaydf1MGH54Q="; - revert = true; - excludes = [ "doc/*" ]; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/ec867ac7ce4e4913a8415eda48a7af9fc226097d.patch?full_index=1"; - hash = "sha256-zfnHxC7ZMZAiu0/6PsX7RFasTevHMETv+azhTZnKI64="; - revert = true; - excludes = [ "doc/*" ]; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/f97865fab436fba24b46dad14435ec4b482243a2.patch?full_index=1"; - hash = "sha256-o5aPQqUXubtJKMX28jn8LdjZHw37/BqENkYt6RAR3kY="; - revert = true; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/54d55f2337ebe04451da770935ad453accb147f9.patch?full_index=1"; - hash = "sha256-gmIyiSyNzC3pClL1SM2YicckWM+/2tsbV1xv2S3d5G0="; - revert = true; - }) ]; }