From f65b1451a0c3281205cacd4b0ec06e995f04de6f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 15 Oct 2021 21:20:57 +0200 Subject: [PATCH] netlify-cli: Switch to shrinkwrap-based package set --- pkgs/development/node-packages/default.nix | 8 -------- pkgs/development/node-packages/node-packages.json | 1 - pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index ccd0b19e1ad3..149ba1c74a47 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -319,14 +319,6 @@ let ''; }; - netlify-cli = - super.netlify-cli.override { - preRebuild = '' - export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild" - ''; - meta.maintainers = with lib.maintainers; [ roberth ]; - }; - ssb-server = super.ssb-server.override { buildInputs = [ pkgs.automake pkgs.autoconf self.node-gyp-build ]; meta.broken = since "10"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 2c9654d1b870..0a32b367ae7d 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -184,7 +184,6 @@ , "multi-file-swagger" , "musescore-downloader" , "neovim" -, "netlify-cli" , "nijs" , "node-gyp" , "node-gyp-build" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9351733ff439..962ecff1c5fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7646,7 +7646,7 @@ with pkgs; netkittftp = callPackage ../tools/networking/netkit/tftp { }; - netlify-cli = nodePackages.netlify-cli; + netlify-cli = callPackage ../development/web/netlify-cli { }; netpbm = callPackage ../tools/graphics/netpbm { };