From b310447bfc91c12308f92176ec37a8fdd1dd9192 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 12 May 2026 01:59:44 +0530
Subject: [PATCH] sail-riscv: migrate to by-name

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 .../sa/sail-riscv/package.nix}                | 22 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 ----
 2 files changed, 12 insertions(+), 14 deletions(-)
 rename pkgs/{applications/virtualization/sail-riscv/default.nix => by-name/sa/sail-riscv/package.nix} (86%)

diff --git a/pkgs/applications/virtualization/sail-riscv/default.nix b/pkgs/by-name/sa/sail-riscv/package.nix
similarity index 86%
rename from pkgs/applications/virtualization/sail-riscv/default.nix
rename to pkgs/by-name/sa/sail-riscv/package.nix
index c44d674fa7e4..a27b9c4e0ca5 100644
--- a/pkgs/applications/virtualization/sail-riscv/default.nix
+++ b/pkgs/by-name/sa/sail-riscv/package.nix
@@ -1,23 +1,25 @@
 {
+  lib,
   stdenv,
   fetchFromGitHub,
-  lib,
-  cmake,
-  gmp,
-  pkg-config,
-  sail,
-  ninja,
+
   z3,
+  cmake,
+  ninja,
+  pkg-config,
+  ocamlPackages,
+
+  gmp,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sail-riscv";
   version = "0.8";
 
   src = fetchFromGitHub {
     owner = "riscv";
     repo = "sail-riscv";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-50ATe3DQcdyNOqP85mEMyEwxzpBOplzRN9ulaJNo9zo=";
   };
 
@@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
     ninja
-    sail
+    ocamlPackages.sail
   ];
   buildInputs = [
     gmp
@@ -42,4 +44,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     license = lib.licenses.bsd2;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab03ed046e40..4712246738cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11479,10 +11479,6 @@ with pkgs;
     waylandSupport = true;
   };
 
-  sail-riscv = callPackage ../applications/virtualization/sail-riscv {
-    inherit (ocamlPackages) sail;
-  };
-
   mfcj470dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj470dwlpr { };
 
   mfcj6510dwlpr = pkgsi686Linux.callPackage ../misc/cups/drivers/mfcj6510dwlpr { };