Unverified Commit d08a22c7 authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

Merge pull request #201937 from panda2134/master 

netlify-cli: 6.13.2 -> 12.2.4, esbuild_netlify: 0.13.6 -> 0.14.39
parents e35699dd e341cd3b

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

+8 −0
Original line number Diff line number Diff line
@@ -1402,6 +1402,14 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [ 
          for more details.

        </para>

      </listitem>

      <listitem>

        <para>

          The <literal>netlify-cli</literal> package has been updated

          from 6.13.2 to 12.2.4, see the

          <link xlink:href="https://github.com/netlify/cli/releases">changelog</link>

          for more details.

        </para>

      </listitem>

      <listitem>

        <para>

          <literal>dockerTools.buildImage</literal> deprecates the

nixos/doc/manual/release-notes/rl-2211.section.md

+2 −0
Original line number Diff line number Diff line
@@ -452,6 +452,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). 


- The `guake` package has been updated from 3.6.3 to 3.9.0, see the [changelog](https://github.com/Guake/guake/releases) for more details.



- The `netlify-cli` package has been updated from 6.13.2 to 12.2.4, see the [changelog](https://github.com/netlify/cli/releases) for more details.



- `dockerTools.buildImage` deprecates the misunderstood `contents` parameter, in favor of `copyToRoot`.

  Use `copyToRoot = buildEnv { ... };` or similar if you intend to add packages to `/bin`.

pkgs/development/tools/esbuild/netlify.nix

+4 −16
Original line number Diff line number Diff line
@@ -7,28 +7,16 @@ 


buildGoModule rec {

  pname = "esbuild";

  version = "0.13.6";

  version = "0.14.39";



  src = fetchFromGitHub {

    owner = "netlify";

    repo = "esbuild";

    rev = "v${version}";

    sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9";

    rev = "5faa7ad54c99a953d05c06819298d2b6f8c82d80";

    sha256 = "pYiwGjgFMclPYTW0Qml7Pr/knT1gywUAGANra5aojYM=";

  };



  vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";



  patches = [

    # Both upstream patches update the same dependency "x/sys". It's required for darwin compatibility.

    (fetchpatch {

      url = "https://github.com/evanw/esbuild/commit/2567e099fcc6959e630f100b2c737ca80e88ba82.patch";

      hash = "sha256-KdX/Ru9TBX0mSDaS1ijxgzDI+2AoCvt6Wilhpca3VC0=";

    })

    (fetchpatch {

      url = "https://github.com/evanw/esbuild/commit/fd13718c6195afb9e63682476a774fa6d4483be0.patch";

      hash = "sha256-va/bXRBQf9qgE9LZXcKKAa0ZpMt/QG7BFClJ8bPWG1Y=";

    })

  ];

  vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";



  passthru = {

    tests = {

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

+3 −3
Original line number Diff line number Diff line 
# This file has been generated by node2nix 1.9.0. Do not edit!

# This file has been generated by node2nix 1.11.1. Do not edit!



{pkgs ? import <nixpkgs> {

    inherit system;

  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:

  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:



let

  nodeEnv = import ./node-env.nix {

    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;

    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;

    inherit pkgs nodejs;

    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;

  };

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

+4 −1
Original line number Diff line number Diff line 
{ callPackage, fetchFromGitHub, lib, pkgs }:

let

  nodePackages = import ./composition.nix { inherit pkgs; };

  sourceInfo = (lib.importJSON ./netlify-cli.json);

in

  nodePackages.package.override {

    preRebuild = ''

      export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild"

    '';

    src = fetchFromGitHub (lib.importJSON ./netlify-cli.json);

    src = fetchFromGitHub {

      inherit (sourceInfo) owner repo rev sha256;

    };

    bypassCache = true;

    reconstructLock = true;

    passthru.tests.test = callPackage ./test.nix { };