Remove no longer needed unsafeDiscardStringContext workaround

Fixed in: NixOS/nix#7260
nix-community · Jun 16, 2024 · 4381f1e · 4381f1e
1 parent 0209f25
commit 4381f1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/crate2nix/templates/crate2nix-sources.nix.tera b/crate2nix/templates/crate2nix-sources.nix.tera
@@ -18,8 +18,7 @@
 , crate2nixJson ? ./crate2nix.json
 }:
 
-# unsafeDiscardStringContext is a workaround for https://github.com/NixOS/nix/issues/6647
-let config = builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile crate2nixJson));
+let config = lib.importJSON crate2nixJson;
  sources = config.sources or (builtins.throw "no sources in ${crate2nixJson}");
 in
 rec {
@@ -108,4 +107,4 @@ rec {
  tar -xzf ${archive} --strip-components=1 -C $out
  '';
  };
-}
+}
diff --git a/tools.nix b/tools.nix
@@ -249,8 +249,7 @@ rec {
 
  locked =
  let
- # unsafeDiscardStringContext is a workaround for https://github.com/NixOS/nix/issues/6647
- parseFile = cargoLock: builtins.fromTOML (builtins.unsafeDiscardStringContext (builtins.readFile cargoLock));
+ parseFile = cargoLock: lib.importTOML cargoLock;
  allParsedFiles = builtins.map parseFile lockFiles;
  merge = merged: lock:
  {