Skip to content

Commit

Permalink
Merge pull request #9 from serokell/zhenya/ops900-new-npm
Browse files Browse the repository at this point in the history
[OPS-900] Fix mkNodeModules for npm 6.11.3
  • Loading branch information
yorickvP committed Dec 5, 2019
2 parents c1d3795 + 8687b48 commit 70938fc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 5 additions & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,11 @@ with stdenv.lib; let
yarnAlias = ''yarn() { ${yarnCmd} $yarnFlags "$@"; }'';

npmFlagsYarn = [ "--offline" "--script-shell=${shellWrap}/bin/npm-shell-wrap.sh" ];
npmFlagsNpm = [ "--cache=./npm-cache" "--nodedir=${_nodejs}" ] ++ npmFlagsYarn;
npmFlagsNpm = [
# `npm ci` treats cache parameter differently since npm 6.11.3:
"--cache=${if versionAtLeast _nodejs.version "10.17.0" then "./npm-cache/_cacache" else "./npm-cache"}"
"--nodedir=${_nodejs}"
] ++ npmFlagsYarn;

commonEnv = {
XDG_CONFIG_DIRS = ".";
Expand Down
6 changes: 3 additions & 3 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a36b2925a5082e821ad80b3a7bfedcc6e488b91c",
"sha256": "14sx173cg1g1lpd5hcarxxz8n78jsffr6pv9l05a58aq0ilgk328",
"rev": "93223f5cc35ccee76d000bb1a18781d35b99878b",
"sha256": "0a52g32w9rxkdq81avzbx8vy8bdbxzkbh41qg8mdxl7wb9qcqv9v",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/a36b2925a5082e821ad80b3a7bfedcc6e488b91c.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/93223f5cc35ccee76d000bb1a18781d35b99878b.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}
}

0 comments on commit 70938fc

Please sign in to comment.