From 1439e821f38bdbcff5f902a00e55eedaf5ee1447 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 3 Jan 2025 13:34:23 +0100 Subject: [PATCH 1/2] refactor: Sort arguments --- pkgs/development/web/netlify-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/development/web/netlify-cli/default.nix index 97ac938ef17f0..6a7897307246f 100644 --- a/pkgs/development/web/netlify-cli/default.nix +++ b/pkgs/development/web/netlify-cli/default.nix @@ -1,11 +1,11 @@ { - callPackage, - vips, - pkg-config, - lib, buildNpmPackage, + callPackage, fetchFromGitHub, + lib, nix-update-script, + pkg-config, + vips, }: buildNpmPackage rec { From 097be59b2a8fd1b358b4b129ee0cf4d0b7b38e2a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 3 Jan 2025 13:40:06 +0100 Subject: [PATCH 2/2] netlify-cli: Pin to nodejs_20 Fixes a node gyp compilation failure --- pkgs/development/web/netlify-cli/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/development/web/netlify-cli/default.nix index 6a7897307246f..653c4c0f06499 100644 --- a/pkgs/development/web/netlify-cli/default.nix +++ b/pkgs/development/web/netlify-cli/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, lib, nix-update-script, + nodejs, pkg-config, vips, }: @@ -21,6 +22,8 @@ buildNpmPackage rec { npmDepsHash = "sha256-pJaNdR9jyFSdfE+yLnQn9/Gbq2CbH6y3aEVbpg3Ft/o="; + inherit nodejs; + buildInputs = [ vips ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3dbd8ab633b64..a0936fa097f9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4405,7 +4405,9 @@ with pkgs; }; }); - netlify-cli = callPackage ../development/web/netlify-cli { }; + netlify-cli = callPackage ../development/web/netlify-cli { + nodejs = nodejs_20; + }; netpbm = callPackage ../tools/graphics/netpbm { };