Skip to content

Commit 4381f1e

Browse files
committed
Remove no longer needed unsafeDiscardStringContext workaround
Fixed in: NixOS/nix#7260
1 parent 0209f25 commit 4381f1e

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

crate2nix/templates/crate2nix-sources.nix.tera

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
, crate2nixJson ? ./crate2nix.json
1919
}:
2020

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;
2322
sources = config.sources or (builtins.throw "no sources in ${crate2nixJson}");
2423
in
2524
rec {
@@ -108,4 +107,4 @@ rec {
108107
tar -xzf ${archive} --strip-components=1 -C $out
109108
'';
110109
};
111-
}
110+
}

tools.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,7 @@ rec {
249249

250250
locked =
251251
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;
254253
allParsedFiles = builtins.map parseFile lockFiles;
255254
merge = merged: lock:
256255
{

0 commit comments

Comments
 (0)