diff options
author | Sandro Jäckel <sandro.jaeckel@sap.com> | 2021-11-03 13:43:23 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-11-03 14:43:52 +0100 |
commit | 8547db919a05c86fe724b972b3130f305d6f4267 (patch) | |
tree | e32513b8699ad0fc393245b6528d867065787b01 /pkgs/development/compilers/adoptopenjdk-bin | |
parent | c463cb880c4e85e116192d1e4a1c9bdf0072da1d (diff) |
treewide: switch ``builtins.fromJSON(builtins.readFile ./file.json)`` to lib.importJSON ./file.json
Diffstat (limited to 'pkgs/development/compilers/adoptopenjdk-bin')
12 files changed, 36 insertions, 12 deletions
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix index 7fec8fd3ff60..1fd2fd8dc09e 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix index e802e2eea528..da5e9c49d236 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.linux.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix index 2654c4f9e726..fdde25bd361d 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix index c33d6afad102..f503b03a833c 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix index 6941a6dd0ddf..1c776f69e2db 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix index 756b419434df..a55a708b3726 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.linux.jdk.hotspot; knownVulnerabilities = ["Support ended"]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix index d627fd9311f8..b9d706653065 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix index 6663d9778bc2..e248555a6d02 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.linux.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix index b2bf2877c8a8..a7473710d14b 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix index 738b31fe1d12..794545ea80a0 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.linux.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix index 5e2d42276ce7..846870869910 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.hotspot; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix index c2a4085f730c..67b50220ba2d 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix @@ -1,5 +1,7 @@ +{ lib }: + let - sources = builtins.fromJSON (builtins.readFile ./sources.json); + sources = lib.importJSON ./sources.json; in { jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.linux.jdk.hotspot; }; |