Skip to content

temurin-bin: support riscv64-linux#337620

Merged
fabianhjr merged 1 commit intoNixOS:masterfrom
getchoo-contrib:pkgs/temurin/riscv64
Sep 13, 2024
Merged

temurin-bin: support riscv64-linux#337620
fabianhjr merged 1 commit intoNixOS:masterfrom
getchoo-contrib:pkgs/temurin/riscv64

Conversation

@getchoo
Copy link
Member

@getchoo getchoo commented Aug 27, 2024

Description of changes

I sadly don't have riscv hardware to test this, so for those who do: helping out here would be greatly appreciated!

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Aug 27, 2024
@getchoo getchoo marked this pull request as draft August 29, 2024 03:34
@getchoo getchoo force-pushed the pkgs/temurin/riscv64 branch from 85abb13 to e4aec7e Compare August 29, 2024 03:35
@getchoo getchoo changed the base branch from master to staging August 29, 2024 03:35
@getchoo getchoo marked this pull request as ready for review August 29, 2024 03:36
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Aug 29, 2024
@skeuchel
Copy link

skeuchel commented Aug 29, 2024

I suggest that instead of regenerating the sources.json entirely, you only add the new riscv64 bins. This is also how ppc64le was added in #209089. That way you avoid the mass rebuilds and it would be much easier to wave through since you would not touch any other platforms. Version bumps are a different story than the riscv64 enablement here, so it should be a separate PR.

@skeuchel
Copy link

skeuchel commented Aug 29, 2024

For reference, here is the list of new binaries that I am getting:

diff 

@@ -194,0 +195,6 @@
+          "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"
+          },
@@ -216,0 +223,6 @@
+          "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"
+          },
@@ -238,0 +251,6 @@
+          "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"
+          },
@@ -342,0 +361,6 @@
+          "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"
+          },
@@ -364,0 +389,6 @@
+          "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"
+          },
@@ -386,0 +417,6 @@
+          "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"
+          },

@getchoo getchoo marked this pull request as draft August 30, 2024 04:19
@getchoo getchoo force-pushed the pkgs/temurin/riscv64 branch from e4aec7e to dfa73af Compare August 30, 2024 04:19
@getchoo getchoo changed the base branch from staging to master August 30, 2024 04:20
@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Aug 30, 2024
@github-actions github-actions bot added 8.has: documentation This PR adds or changes documentation and removed 6.topic: python Python is a high-level, general-purpose programming language. 8.has: documentation This PR adds or changes documentation labels Aug 30, 2024
@getchoo getchoo marked this pull request as ready for review August 30, 2024 04:20
@ofborg ofborg bot added 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Aug 30, 2024
skeuchel
skeuchel approved these changes Aug 30, 2024
View reviewed changes
Copy link

@skeuchel skeuchel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@getchoo getchoo added the 12.approvals: 1 This PR was reviewed and approved by one person. label Aug 30, 2024
NickCao
NickCao approved these changes Aug 31, 2024
View reviewed changes
Copy link
Member

@NickCao NickCao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested temurin-bin-22 under qemu-riscv64, LGTM!

@NickCao NickCao requested a review from taku0 August 31, 2024 14:58
@getchoo getchoo added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Aug 31, 2024
@fabianhjr fabianhjr merged commit 33a6a5c into NixOS:master Sep 13, 2024
@getchoo getchoo deleted the pkgs/temurin/riscv64 branch September 13, 2024 19:22
@skeuchel skeuchel mentioned this pull request Sep 23, 2024
Merged
14 tasks
@FliegendeWurst FliegendeWurst mentioned this pull request Oct 19, 2024
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@NickCao NickCao NickCao approved these changes

@taku0 taku0 Awaiting requested review from taku0

+1 more reviewer

@skeuchel skeuchel skeuchel approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@getchoo @skeuchel @NickCao @fabianhjr