Unverified Commit 3ef36b4f authored by Antoine du Hamel's avatar Antoine du Hamel
Browse files

buildNpmPackage: add support for `npm-shrinkwrap.json`

parent 1e854902

pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh

+5 −1
Original line number Diff line number Diff line
@@ -29,7 +29,11 @@ npmConfigHook() { 
    fi



    local -r cacheLockfile="$npmDeps/package-lock.json"

    if [[ -f npm-shrinkwrap.json ]]; then

        local -r srcLockfile="$PWD/npm-shrinkwrap.json"

    else

        local -r srcLockfile="$PWD/package-lock.json"

    fi



    echo "Validating consistency between $srcLockfile and $cacheLockfile"

pkgs/by-name/ar/ares-cli/package.nix

+0 −4
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ buildNpmPackage rec { 
    hash = "sha256-L8suZDtXVchVyvp7KCv0UaceJqqGBdfopd5tZzwj3MY=";

  };



  postPatch = ''

    ln -s npm-shrinkwrap.json package-lock.json

  '';



  dontNpmBuild = true;

  npmDepsHash = "sha256-ATIxe/sulfOpz5KiWauDAPZrlfUOFyiTa+5ECFbVd+0=";

pkgs/by-name/ba/balena-cli/package.nix

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ buildNpmPackage' rec { 


  npmDepsHash = "sha256-SWtWXvWUuIzMqLoEDRTqVJyWNK/FXOA/LF73kCWfuz4=";



  postPatch = ''

    ln -s npm-shrinkwrap.json package-lock.json

  '';

  makeCacheWritable = true;



  nativeBuildInputs = [

pkgs/by-name/bt/btc-rpc-explorer/package.nix

+0 −4
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ buildNpmPackage rec { 


  npmDepsHash = "sha256-eYA2joO4wcV10xJeYLqCbvM2szWlqofmugoHHD9D30U=";



  postPatch = ''

    ln -s npm-shrinkwrap.json package-lock.json

  '';



  makeCacheWritable = true;



  nativeBuildInputs = [

pkgs/by-name/fi/firebase-tools/package.nix

+0 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ buildNpmPackage rec { 


  npmDepsHash = "sha256-EhUJj1kSMslCXhgzCEiVn+4DSmRfvj/nh3OmaZCh/bk=";



  postPatch = ''

    ln -s npm-shrinkwrap.json package-lock.json

  '';



  nativeBuildInputs = [

    python3

  ]