fix: forbidden string contexts in newer nix versions

styx-static · Aug 13, 2022 · b9e46d1 · b9e46d1
1 parent e711b4a
commit b9e46d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/derivation.nix b/derivation.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   allowSubstitutes = false;
 
   name    = "styx-${version}";
-  version = lib.fileContents ./VERSION;
+  version = builtins.unsafeDiscardStringContext (lib.fileContents ./VERSION);
 
   src = lib.cleanSource ./.;
 

diff --git a/nix/sources.nix b/nix/sources.nix
@@ -179,7 +179,7 @@ let
   # The "config" used by the fetchers
   mkConfig =
     { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
-    , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
+    , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile sourcesFile))
     , system ? builtins.currentSystem
     , pkgs ? mkPkgs sources system
     }: rec {