nix-community/dream2nix
1
1
Fork 0
mirror of https://github.com/nix-community/dream2nix.git synced 2024-09-21 03:19:17 +03:00
Code Issues Projects Releases Wiki Activity

fix parsing CRLF formatted files

Browse Source
This commit is contained in:
DavHau 2021-10-07 16:25:28 +07:00
parent 1c48002dfc
commit d06519bce0
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -69,6 +69,7 @@
shellHook = ''
export NIX_PATH=nixpkgs=${nixpkgs}
export d2nExternalSources=${externalSourcesFor."${system}"}
'';
});
};

2
src/translators/nodejs/pure/yarn-lock/default.nix
View File

@ -16,7 +16,7 @@
}:
let
b = builtins;
yarnLock = "${lib.elemAt inputDirectories 0}/yarn.lock";
yarnLock = utils.readTextFile "${lib.elemAt inputDirectories 0}/yarn.lock";
packageJSON = b.fromJSON (b.readFile "${lib.elemAt inputDirectories 0}/package.json");
parser = import ./parser.nix { inherit lib; inherit (externals) nix-parsec;};
tryParse = parser.parseLock yarnLock;

2
src/translators/nodejs/pure/yarn-lock/parser.nix
View File

@ -73,5 +73,5 @@ rec {
(skipThen skipEmptyLinesAndComments
(thenSkip (sepBy group newLine) eof));
parseLock = path: nix-parsec.parsec.runParser configFile (builtins.readFile path);
parseLock = text: nix-parsec.parsec.runParser configFile text;
}

2
src/utils/default.nix
View File

@ -17,6 +17,8 @@ rec {
readDreamLock = callPackageDream ./readDreamLock.nix {};
readTextFile = file: lib.replaceStrings [ "\r\n" ] [ "\n" ] (b.readFile file);
isFile = path: (builtins.readDir (b.dirOf path))."${b.baseNameOf path}" == "regular";
isDir = path: (builtins.readDir (b.dirOf path))."${b.baseNameOf path}" == "directory";