gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #316983 from edolstra/let-float-json

Browse Source 
Let-float various fromJSON calls to avoid repeated JSON reading/parsing
This commit is contained in:
adisbladis
2024-07-04 13:47:08 +12:00
committed by GitHub
parent 7e4cda72fc 8d2a765adf
commit 1be927ca66
21 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
View File

@@ -1,7 +1,7 @@
{ lib }:
let
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
View File

@@ -2,7 +2,7 @@
let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.hotspot; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
View File

@@ -1,7 +1,7 @@
{ lib }:
let
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
View File

@@ -2,7 +2,7 @@
let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix
View File

@@ -1,7 +1,7 @@
{ lib }:
let
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
View File

@@ -2,7 +2,7 @@
let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
View File

@@ -1,7 +1,7 @@
{ lib }:
let
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
View File

@@ -2,7 +2,7 @@
let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix
View File

@@ -1,7 +1,7 @@
{ lib }:
let
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
View File

@@ -2,7 +2,7 @@
let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix
View File

@@ -1,7 +1,7 @@
{ lib }:
let
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jdk.hotspot; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix
View File

@@ -2,7 +2,7 @@
let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jdk.hotspot; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
View File

@@ -1,7 +1,7 @@
{ lib }:
let
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.hotspot; };

2
pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
View File

@@ -2,7 +2,7 @@
let
variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
sources = lib.importJSON ./sources.json;
sources = import ./sources.nix;
in
{
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.hotspot; };

1
pkgs/development/compilers/adoptopenjdk-bin/sources.nix Normal file
View File

@@ -0,0 +1 @@
builtins.fromJSON (builtins.readFile ./sources.json)