From dfa73af57d60a40fc1dc7e65513e2928f811e819 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 26 Aug 2024 23:27:37 -0400 Subject: [PATCH] temurin-bin: support riscv64-linux --- .../compilers/temurin-bin/generate-sources.py | 1 + .../compilers/temurin-bin/sources.json | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index f9e53e197c97..adeca0b73326 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -16,6 +16,7 @@ arch_to_nixos = { "aarch64": ("aarch64",), "arm": ("armv6l", "armv7l"), "ppc64le": ("powerpc64le",), + "riscv64": ("riscv64",), } def generate_sources(assets, feature_version, out): diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index fe24b9f5199c..23d7305ea774 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -302,6 +302,12 @@ "sha256": "aa7fb6bb342319d227a838af5c363bfa1b4a670c209372f9e6585bd79da6220c", "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz", "version": "17.0.11" + }, + "riscv64": { + "build": "7", + "sha256": "d024c100eba4709970716ddcac757ba5e3122a8ff9c6f539ff8bac5b47f51f3a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk18": { @@ -414,6 +420,12 @@ "sha256": "fffa52c22d797b715a962e6c8d11ec7d79b90dd819b5bc51d62137ea4b22a340", "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz", "version": "21.0.3" + }, + "riscv64": { + "build": "7", + "sha256": "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, "openjdk22": { @@ -436,6 +448,12 @@ "sha256": "e59c6bf801cc023a1ea78eceb5e6756277f1564cd0a421ea984efe6cb96cfcf8", "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_linux_hotspot_22.0.1_8.tar.gz", "version": "22.0.1" + }, + "riscv64": { + "build": "9", + "sha256": "830a0d006c2dae95c0855aa70e193dba637831b491ccd67333322dea31bcf389", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_riscv64_linux_hotspot_22.0.2_9.tar.gz", + "version": "22.0.2" } }, "openjdk8": { @@ -540,6 +558,12 @@ "sha256": "bcb1b7b8ad68c93093f09b591b7cb17161d39891f7d29d33a586f5a328603707", "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz", "version": "17.0.11" + }, + "riscv64": { + "build": "7", + "sha256": "2d1ed42918305a1a0754a6e1e9294c7d4d7fda4bff6dba7bc5682037d860dbc9", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk18": { @@ -652,6 +676,12 @@ "sha256": "f1af100c4afca2035f446967323230150cfe5872b5a664d98c86963e5c066e0d", "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz", "version": "21.0.3" + }, + "riscv64": { + "build": "7", + "sha256": "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, "openjdk22": { @@ -674,6 +704,12 @@ "sha256": "154dbc7975cf765c59bdaa1e693d6c8b009635c9a182d6d6d9f0cfbec5317b4c", "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_linux_hotspot_22.0.1_8.tar.gz", "version": "22.0.1" + }, + "riscv64": { + "build": "9", + "sha256": "81aacc0ae75e65846e6207edf41b8c5927673eba5588eebc5ba8076ca9a6041c", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_riscv64_linux_hotspot_22.0.2_9.tar.gz", + "version": "22.0.2" } }, "openjdk8": {