netlify-cli: Use mkPackage

This allows the all-packages.nix entry to be removed
when the package goes to pkgs/by-name 🎉

pkgs/development/web/netlify-cli/default.nix

@@ -1,43 +1,44 @@
-{
-  buildNpmPackage,
-  callPackage,
-  fetchFromGitHub,
-  lib,
-  nix-update-script,
-  nodejs,
-  pkg-config,
-  vips,
-}:
+{ mkPackage }: mkPackage (
+{ lib, layers, stdenv, fetchFromGitHub, nix-update-script, pkg-config, vips, callPackage, testers, nodejs_20, ... }:
+[
+  (layers.derivation { inherit stdenv; })
+  (this: old: {
+    name = "netlify-cli";
+    version = "17.38.0";
 
-buildNpmPackage rec {
-  pname = "netlify-cli";
-  version = "17.38.0";
+    deps = old.deps // {
+      nodejs = nodejs_20;
+    };
 
-  src = fetchFromGitHub {
-    owner = "netlify";
-    repo = "cli";
-    tag = "v${version}";
-    hash = "sha256-fK+Z6bqnaqSYXgO0lUbGALZeCiAnvMd6LkMSH7JB7J8=";
-  };
+    npmFetch.hash = "sha256-oFt+l8CigOtm3W5kiT0kFsqKLOJB9ggfiFQgUU5xQ1I=";
 
-  npmDepsHash = "sha256-oFt+l8CigOtm3W5kiT0kFsqKLOJB9ggfiFQgUU5xQ1I=";
+    setup = {
+      buildInputs = [ vips ];
+      nativeBuildInputs = [ pkg-config ];
+      src = fetchFromGitHub {
+        owner = "netlify";
+        repo = "cli";
+        tag = "v${this.version}";
+        hash = "sha256-fK+Z6bqnaqSYXgO0lUbGALZeCiAnvMd6LkMSH7JB7J8=";
+      };
+    };
 
-  inherit nodejs;
+    public = old.public // {
+      tests = {
+        version = testers.testVersion { package = this.public; };
+        run = callPackage ./test.nix { netlify-cli = this.public; };
+      };
+      updateScript = nix-update-script { };
+    };
 
-  buildInputs = [ vips ];
-  nativeBuildInputs = [ pkg-config ];
-
-  passthru = {
-    tests.test = callPackage ./test.nix { };
-    updateScript = nix-update-script { };
-  };
-
-  meta = {
-    description = "Netlify command line tool";
-    homepage = "https://github.com/netlify/cli";
-    changelog = "https://github.com/netlify/cli/blob/v${version}/CHANGELOG.md";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ roberth ];
-    mainProgram = "netlify";
-  };
-}
+    meta = {
+      description = "Netlify command line tool";
+      homepage = "https://github.com/netlify/cli";
+      changelog = "https://github.com/netlify/cli/blob/v${this.version}/CHANGELOG.md";
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ roberth ];
+      mainProgram = "netlify";
+    };
+  })
+  layers.buildNpmPackage
+])

pkgs/top-level/all-packages.nix

@@ -4357,9 +4357,7 @@ with pkgs;
     };
   });
 
-  netlify-cli = callPackage ../development/web/netlify-cli {
-    nodejs = nodejs_20;
-  };
+  netlify-cli = callPackage ../development/web/netlify-cli { };
 
   netpbm = callPackage ../tools/graphics/netpbm { };