From 1c48002dfc3b3a1c5139c2bceccce705ef1524ce Mon Sep 17 00:00:00 2001 From: DavHau Date: Thu, 7 Oct 2021 14:38:19 +0700 Subject: [PATCH] fix bugs --- src/translators/default.nix | 5 +++-- .../nodejs/pure/yarn-lock/default.nix | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/translators/default.nix b/src/translators/default.nix index 16a84709..17fc319b 100644 --- a/src/translators/default.nix +++ b/src/translators/default.nix @@ -1,8 +1,9 @@ { + coreutils, lib, - callPackageDream, pkgs, + callPackageDream, externalSources, externals, dream2nixWithExternals, @@ -48,7 +49,7 @@ let bin = pkgs.writeScriptBin "translate" '' #!${pkgs.bash}/bin/bash - jsonInputFile=$(realpath $1) + jsonInputFile=$(${coreutils}/bin/realpath $1) outputFile=$(${pkgs.jq}/bin/jq '.outputFile' -c -r $jsonInputFile) nix eval --show-trace --impure --raw --expr " diff --git a/src/translators/nodejs/pure/yarn-lock/default.nix b/src/translators/nodejs/pure/yarn-lock/default.nix index ecaaa7c1..2ca16166 100644 --- a/src/translators/nodejs/pure/yarn-lock/default.nix +++ b/src/translators/nodejs/pure/yarn-lock/default.nix @@ -28,7 +28,7 @@ let failureOffset = tryParse.value.offset; in - throw "parser failed at: \n${lib.substring failureOffset (failureOffset + 50) tryParse.value.str}"; + throw "parser failed at: \n${lib.substring failureOffset 50 tryParse.value.str}"; nameFromLockName = lockName: let version = lib.last (lib.splitString "@" lockName); @@ -69,13 +69,15 @@ dependencies = dependencyAttrs.dependencies or [] ++ dependencyAttrs.optionalDependencies or []; graph = lib.forEach dependencies (dependency: builtins.head ( - lib.mapAttrsToList (name: value: - let - yarnName = "${name}@${value}"; - version = parsedLock."${yarnName}".version; - in - "${name}#${version}" - ) dependency + lib.mapAttrsToList + (name: value: + let + yarnName = "${name}@${value}"; + version = parsedLock."${yarnName}".version; + in + "${name}#${version}" + ) + dependency ) ); in