use lib.importJSON instead of reimplementing it

nix-community · Jan 10, 2024 · ee296ca · ee296ca
1 parent 848a45a
commit ee296ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix
@@ -21,10 +21,9 @@
     gear = import ./gear {inherit (self) callPackage;};
     plasma = import ./plasma {inherit (self) callPackage;};
 
-    readJson = f: builtins.fromJSON (builtins.readFile f);
     sets = ["gear" "frameworks" "plasma"];
 
-    loadUrls = set: readJson (./generated/sources + "/${set}.json");
+    loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json");
     allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets);
 
     sources = lib.mapAttrs (_: v:

diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix
@@ -6,11 +6,10 @@ self: {
   cmake,
   qt6,
 }: let
-  readJson = f: builtins.fromJSON (builtins.readFile f);
-  dependencies = (readJson ../generated/dependencies.json).dependencies;
-  projectInfo = readJson ../generated/projects.json;
+  dependencies = (lib.importJSON ../generated/dependencies.json).dependencies;
+  projectInfo = lib.importJSON ../generated/projects.json;
 
-  licenseInfo = readJson ../generated/licenses.json;
+  licenseInfo = lib.importJSON ../generated/licenses.json;
   licensesBySpdxId =
     (lib.mapAttrs' (_: v: {
         name = v.spdxId or "unknown";