File tree Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Original file line number Diff line number Diff line change 18
18
, crate2nixJson ? ./crate2nix.json
19
19
}:
20
20
21
- # unsafeDiscardStringContext is a workaround for https://github.com/NixOS/nix/issues/6647
22
- let config = builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile crate2nixJson));
21
+ let config = lib.importJSON crate2nixJson;
23
22
sources = config.sources or (builtins.throw "no sources in ${crate2nixJson}");
24
23
in
25
24
rec {
@@ -108,4 +107,4 @@ rec {
108
107
tar -xzf ${archive} --strip-components=1 -C $out
109
108
'';
110
109
};
111
- }
110
+ }
Original file line number Diff line number Diff line change @@ -249,8 +249,7 @@ rec {
249
249
250
250
locked =
251
251
let
252
- # unsafeDiscardStringContext is a workaround for https://github.com/NixOS/nix/issues/6647
253
- parseFile = cargoLock : builtins . fromTOML ( builtins . unsafeDiscardStringContext ( builtins . readFile cargoLock ) ) ;
252
+ parseFile = cargoLock : lib . importTOML cargoLock ;
254
253
allParsedFiles = builtins . map parseFile lockFiles ;
255
254
merge = merged : lock :
256
255
{
You can’t perform that action at this time.
0 commit comments