diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-12-09 01:49:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-09 01:49:46 +0100 |
commit | b121d01d2918a51d8a8f8146559f172b812e4ec3 (patch) | |
tree | 61237a5ba3cd677ed66c415af65628e18e8ead9c /pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js | |
parent | af4d8dbdde9e5af9de02fab8132bdad59501f63f (diff) | |
parent | 487aaa905f78e7f3acaef238650552d74730851b (diff) |
Merge pull request #119522 from AmineChikhaoui/yarn2nix-use-integrity-field
yarn2nix: use yarn lockfile integrity field whenever possible
Diffstat (limited to 'pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js')
-rwxr-xr-x | pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js index 86e92f852087b..3c067fc99aaa2 100755 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/internal/fixup_yarn_lock.js @@ -25,14 +25,14 @@ const result = [] readFile .on('line', line => { - const arr = line.match(/^ {2}resolved "([^#]+)#([^"]+)"$/) + const arr = line.match(/^ {2}resolved "([^#]+)(#[^"]+)?"$/) if (arr !== null) { const [_, url, shaOrRev] = arr const fileName = urlToName(url) - result.push(` resolved "${fileName}#${shaOrRev}"`) + result.push(` resolved "${fileName}${shaOrRev ?? ''}"`) } else { result.push(line) } |