diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-05 00:07:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-05 00:07:13 +0000 |
commit | ab4eda8513577d4e868d327c5ef8a5d0e55760d8 (patch) | |
tree | 5c2227a6614a49e2261a8d2ec49e82082da522bf /pkgs/development/compilers | |
parent | 50c285059faa03f3bd0467b59897e3f63672483f (diff) | |
parent | 8aba57cfc977d2fc4a2a1764aa26d6fc8f279267 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development/compilers')
13 files changed, 37 insertions, 13 deletions
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix index 7fec8fd3ff60d..1fd2fd8dc09e4 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 e802e2eea5287..da5e9c49d2360 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 2654c4f9e7260..fdde25bd361df 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 c33d6afad102b..f503b03a833c2 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 6941a6dd0ddf9..1c776f69e2dba 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 756b419434df3..a55a708b3726a 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 d627fd9311f85..b9d706653065b 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 6663d9778bc2c..e248555a6d022 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 b2bf2877c8a83..a7473710d14ba 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 738b31fe1d122..794545ea80a0b 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 5e2d42276ce7d..8468708699109 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 c2a4085f730c8..67b50220ba2d0 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; }; diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix index f8e7c31353f74..6b8a251197d8c 100644 --- a/pkgs/development/compilers/ghcjs/8.10/default.nix +++ b/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -3,7 +3,7 @@ , callPackage , fetchgit , ghcjsSrcJson ? null -, ghcjsSrc ? fetchgit (builtins.fromJSON (builtins.readFile ghcjsSrcJson)) +, ghcjsSrc ? fetchgit lib.importJSON ghcjsSrcJson , bootPkgs , stage0 , haskellLib |