From 1b4f8fb6f499eafe9e6023aa17437a3895017ff2 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 2 Jan 2026 02:18:58 +0100 Subject: [PATCH] ride: update nan version to fix build with nodejs_24 --- pkgs/by-name/ri/ride/package.nix | 5 ++--- pkgs/by-name/ri/ride/update-nan.patch | 18 +++++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ri/ride/package.nix b/pkgs/by-name/ri/ride/package.nix index 09f6a6eeb6d4..f690c035c227 100644 --- a/pkgs/by-name/ri/ride/package.nix +++ b/pkgs/by-name/ri/ride/package.nix @@ -3,7 +3,6 @@ stdenv, buildNpmPackage, fetchFromGitHub, - fetchpatch, replaceVars, jq, moreutils, @@ -25,7 +24,7 @@ buildNpmPackage rec { hash = "sha256-11wlKK0z3/KRKMKNrDvZLvK7vV0UzrMTaG0ei9n6VEk="; }; - npmDepsHash = "sha256-1+RjSr5FSaQFqkL/yzlAQhm56NVG2kjzZC/DsEi3HJE="; + npmDepsHash = "sha256-o8pwjx5P/1eFV3HTWlHGV1/ad9YUSOI0zUWvqkqIf3I="; patches = [ # Fix info in the "about" page, enable asar, add option to build for the detected system @@ -33,7 +32,7 @@ buildNpmPackage rec { inherit version; }) - # would not build with nodejs_22 and above without this + # would not build with nodejs_24 and above without this ./update-nan.patch ]; diff --git a/pkgs/by-name/ri/ride/update-nan.patch b/pkgs/by-name/ri/ride/update-nan.patch index 64f835915f3e..801743fb6575 100644 --- a/pkgs/by-name/ri/ride/update-nan.patch +++ b/pkgs/by-name/ri/ride/update-nan.patch @@ -1,31 +1,31 @@ diff --git a/package-lock.json b/package-lock.json -index a0bd285..5a5ec59 100644 +index cc8b8bd..13b4bed 100644 --- a/package-lock.json +++ b/package-lock.json -@@ -8034,9 +8034,10 @@ +@@ -8190,9 +8190,10 @@ "dev": true }, "node_modules/nan": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", - "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", -+ "version": "2.22.0", -+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", -+ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", ++ "version": "2.24.0", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.24.0.tgz", ++ "integrity": "sha512-Vpf9qnVW1RaDkoNKFUvfxqAbtI8ncb8OJlqZ9wwpXzWPEsvsB1nvdUi6oYrHIkQ1Y/tMDnr1h4nczS0VB9Xykg==", + "license": "MIT", "optional": true }, "node_modules/nanomatch": { -@@ -18258,9 +18259,9 @@ +@@ -18572,9 +18573,9 @@ "dev": true }, "nan": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", - "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", -+ "version": "2.22.0", -+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", -+ "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", ++ "version": "2.24.0", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.24.0.tgz", ++ "integrity": "sha512-Vpf9qnVW1RaDkoNKFUvfxqAbtI8ncb8OJlqZ9wwpXzWPEsvsB1nvdUi6oYrHIkQ1Y/tMDnr1h4nczS0VB9Xykg==", "optional": true }, "nanomatch": {