Unverified Commit 955f4f65 authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #230177 from SuperSandro2000/lib-fromJSON-2

treewide: switch builtins.fromJSON(builtins.readFile ./file.json) to …
parents da914e87 00000001
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
{ pkgs ? import ../../.. {} }:
let
  inherit (pkgs) lib;
  manpageURLs = builtins.fromJSON (builtins.readFile (pkgs.path + "/doc/manpage-urls.json"));
  manpageURLs = lib.importJSON (pkgs.path + "/doc/manpage-urls.json");
in pkgs.writeText "link-manpages.lua" ''
  --[[
  Adds links to known man pages that aren't already in a link.
+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@
}:

let
  hashesFile = builtins.fromJSON (builtins.readFile ./hashes.json);
  hashesFile = lib.importJSON ./hashes.json;

  getCoreSrc = core:
    fetchFromGitHub (builtins.getAttr core hashesFile);
+2 −2
Original line number Diff line number Diff line
{ fetchurl, fetchFromGitLab }:
let src = builtins.fromJSON (builtins.readFile ./src.json);
{ lib, fetchurl, fetchFromGitLab }:
let src = lib.importJSON ./src.json;
in
{
  inherit (src) packageVersion;
+2 −2
Original line number Diff line number Diff line
@@ -135,11 +135,11 @@ let
  packageOverrideRepository = (callPackage ../../development/compilers/flutter/package-overrides { }) // customPackageOverrides;
  productPackages = builtins.filter (package: package.kind != "dev")
    (if autoDepsList
    then builtins.fromJSON (builtins.readFile deps.depsListFile)
    then lib.importJSON deps.depsListFile
    else
      if depsListFile == null
      then [ ]
      else builtins.fromJSON (builtins.readFile depsListFile));
      else lib.importJSON depsListFile);
in
builtins.foldl'
  (prev: package:
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
# and callHackage
{ lib, fetchurl }:
let
  pin = builtins.fromJSON (builtins.readFile ./pin.json);
  pin = lib.importJSON ./pin.json;
in
fetchurl {
  inherit (pin) url sha256;
Loading