From af6fce2f37fc841119aa56db60df21feae93240e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= <radim@krcmar.dev>
Date: Tue, 12 Aug 2025 18:52:15 +0200
Subject: [PATCH] sail-riscv: 0.7 -> 0.8

Thanks to improved runtime configuration, there is a single binary,
sail_riscv_sim, instead of a binary for each base architecture.

The zlib dependency actually got dropped in 0.7: fb6dd20fec53 ("Bump
required sail compiler version to 0.19 and remove zlib dependency")
---
 doc/release-notes/rl-2511.section.md          |  2 ++
 .../virtualization/sail-riscv/default.nix     | 19 ++++---------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 99f2cc2e0f0a..1d469c87dc7d 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -186,6 +186,8 @@
 
 - `hsd` has been upgraded to version 8. See [their changelog](https://github.com/handshake-org/hsd/blob/v8.0.0/docs/release-notes/release-notes-8.x.md) for important instructions before upgrading.
 
+- `sail-riscv` 0.8 follows [upstream](https://github.com/riscv/sail-riscv/blob/7cc4620eb1a57bfe04832baccdcf5727e9459bd4/doc/ChangeLog.md) and provides only a single binary, `sail_riscv_sim`.
+
 - `podofo` has been updated from `0.9.8` to `1.0.0`. These releases are by nature very incompatible due to major API changes. The legacy versions can be found under `podofo_0_10` and `podofo_0_9`.
   Changelog: https://github.com/podofo/podofo/blob/1.0.0/CHANGELOG.md, API-Migration-Guide: https://github.com/podofo/podofo/blob/1.0.0/API-MIGRATION.md.
 
diff --git a/pkgs/applications/virtualization/sail-riscv/default.nix b/pkgs/applications/virtualization/sail-riscv/default.nix
index ccc696a739ee..55b11418df81 100644
--- a/pkgs/applications/virtualization/sail-riscv/default.nix
+++ b/pkgs/applications/virtualization/sail-riscv/default.nix
@@ -7,19 +7,18 @@
   pkg-config,
   sail,
   ninja,
-  zlib,
   z3,
 }:
 
 stdenv.mkDerivation rec {
   pname = "sail-riscv";
-  version = "0.7";
+  version = "0.8";
 
   src = fetchFromGitHub {
     owner = "riscv";
     repo = "sail-riscv";
     rev = version;
-    hash = "sha256-Keu96+yHWUEFO3rRLvF7rzcJmF3y/V/uyK7TIFj0Xw0=";
+    hash = "sha256-50ATe3DQcdyNOqP85mEMyEwxzpBOplzRN9ulaJNo9zo=";
   };
 
   nativeBuildInputs = [
@@ -30,22 +29,12 @@ stdenv.mkDerivation rec {
     sail
   ];
   buildInputs = [
-    zlib
     gmp
   ];
   strictDeps = true;
 
-  preBuild = ''
-    ninja \
-      riscv_sim_rv32d      \
-      riscv_sim_rv32d_rvfi \
-      riscv_sim_rv32f      \
-      riscv_sim_rv32f_rvfi \
-      riscv_sim_rv64d      \
-      riscv_sim_rv64d_rvfi \
-      riscv_sim_rv64f      \
-      riscv_sim_rv64f_rvfi
-  '';
+  # sail-riscv 0.8 fails to install without compressed_changelog
+  ninjaFlags = [ "compressed_changelog" ];
 
   meta = with lib; {
     homepage = "https://github.com/riscv/sail-riscv";