diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index bbc9a804aa74..ccd0b19e1ad3 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -1,6 +1,7 @@ { pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl }: let + inherit (pkgs) lib; since = (version: pkgs.lib.versionAtLeast nodejs.version version); before = (version: pkgs.lib.versionOlder nodejs.version version); super = import ./composition.nix { @@ -319,23 +320,11 @@ let }; netlify-cli = - let - esbuild = pkgs.esbuild.overrideAttrs (old: rec { - version = "0.13.6"; - - src = fetchFromGitHub { - owner = "netlify"; - repo = "esbuild"; - rev = "v${version}"; - sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9"; - }; - - }); - in super.netlify-cli.override { preRebuild = '' - export ESBUILD_BINARY_PATH="${esbuild}/bin/esbuild" + export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild" ''; + meta.maintainers = with lib.maintainers; [ roberth ]; }; ssb-server = super.ssb-server.override { diff --git a/pkgs/development/tools/esbuild/netlify.nix b/pkgs/development/tools/esbuild/netlify.nix new file mode 100644 index 000000000000..efd5b917e9cd --- /dev/null +++ b/pkgs/development/tools/esbuild/netlify.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "esbuild"; + version = "0.13.6"; + + src = fetchFromGitHub { + owner = "netlify"; + repo = "esbuild"; + rev = "v${version}"; + sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9"; + }; + + vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; + + meta = with lib; { + description = "A fork of esbuild maintained by netlify"; + homepage = "https://github.com/netlify/esbuild"; + license = licenses.mit; + maintainers = with maintainers; [ roberth ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84f1979bbb2d..d12eb493ea5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1614,6 +1614,8 @@ with pkgs; esbuild = callPackage ../development/tools/esbuild { }; + esbuild_netlify = callPackage ../development/tools/esbuild/netlify.nix { }; + essentia-extractor = callPackage ../tools/audio/essentia-extractor { }; esh = callPackage ../tools/text/esh { };