From 8d910659e140fa64141aad4abd74a45ccf5db2e3 Mon Sep 17 00:00:00 2001
From: Shogo Takata <shogo-takata@st.go.tuat.ac.jp>
Date: Wed, 25 Mar 2026 16:35:47 +0900
Subject: [PATCH 1/2] cargo-risczero: 1.1.2 -> 3.0.5

---
 pkgs/by-name/ca/cargo-risczero/package.nix | 33 +++++++++++-----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix
index 579345d9b265..099209e552f9 100644
--- a/pkgs/by-name/ca/cargo-risczero/package.nix
+++ b/pkgs/by-name/ca/cargo-risczero/package.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   fetchCrate,
   fetchurl,
   rustPlatform,
@@ -8,28 +7,31 @@
   openssl,
   nix-update-script,
 }:
+let
+  # That is from cargoDeps/risc0-circuit-recursion/build.rs
+  src-recursion-hash = "744b999f0a35b3c86753311c7efb2a0054be21727095cf105af6ee7d3f4d8849";
+  src-recursion = fetchurl {
+    name = "cargo-risczero-recursion-source";
+    url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${src-recursion-hash}.zip";
+    outputHash = src-recursion-hash; # This hash should be the same as src-recuresion-hash
+    outputHashAlgo = "sha256";
+  };
+in
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-risczero";
-  version = "1.1.2";
+  version = "3.0.5";
 
   src = fetchCrate {
-    inherit pname version;
-    hash = "sha256-YZ3yhj1VLxl3Fg/yWhqrZXxIQ7oK6Gdo0NU39oDvoo8=";
-  };
-
-  src-recursion-hash = "28e4eeff7a8f73d27408d99a1e3e8842c79a5f4353e5117ec0b7ffaa7c193612"; # That is from cargoDeps/risc0-circuit-recursion/build.rs
-
-  src-recursion = fetchurl {
-    url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${src-recursion-hash}.zip";
-    hash = "sha256-KOTu/3qPc9J0CNmaHj6IQseaX0NT5RF+wLf/qnwZNhI="; # This hash should be the same as src-recuresion-hash
+    inherit (finalAttrs) pname version;
+    hash = "sha256-1tuY+XoZpilak9gc5vDnRDEB1SK+itBWoGNxwefT6xo=";
   };
 
   env = {
     RECURSION_SRC_PATH = src-recursion;
   };
 
-  cargoHash = "sha256-r2bs1MT2jBK4ATUKyRGLEAFCHNaGnnQ4jbQOKbQbldY=";
+  cargoHash = "sha256-ayKQvhjYawPEl9ryVmDx4J93/EGPSeKds0mOnkRI2Fo=";
 
   nativeBuildInputs = [
     pkg-config
@@ -39,9 +41,6 @@ rustPlatform.buildRustPackage rec {
     openssl
   ];
 
-  # The tests require network access which is not available in sandboxed Nix builds.
-  doCheck = false;
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
@@ -51,4 +50,4 @@ rustPlatform.buildRustPackage rec {
     license = with lib.licenses; [ asl20 ];
     maintainers = with lib.maintainers; [ cameronfyfe ];
   };
-}
+})

From 2d04b5a999fc443f98e7e4ba5945060b13dafbd9 Mon Sep 17 00:00:00 2001
From: Shogo Takata <shogo-takata@st.go.tuat.ac.jp>
Date: Wed, 25 Mar 2026 16:36:09 +0900
Subject: [PATCH 2/2] r0vm: remove package

The binary is provided by "cargo-risczero" package.
---
 pkgs/by-name/r0/r0vm/package.nix | 57 --------------------------------
 pkgs/top-level/aliases.nix       |  1 +
 2 files changed, 1 insertion(+), 57 deletions(-)
 delete mode 100644 pkgs/by-name/r0/r0vm/package.nix

diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix
deleted file mode 100644
index 6027d2ce8357..000000000000
--- a/pkgs/by-name/r0/r0vm/package.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  rustPlatform,
-  fetchFromGitHub,
-  fetchurl,
-  pkg-config,
-  perl,
-  openssl,
-  lib,
-}:
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "r0vm";
-  version = "1.0.5";
-  src = fetchFromGitHub {
-    owner = "risc0";
-    repo = "risc0";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-jtROtI5/4W2pNvn1ZYR/wQAZmECTr7YxuZGu2Ns9paw=";
-  };
-
-  buildAndTestSubdir = "risc0/r0vm";
-
-  nativeBuildInputs = [
-    pkg-config
-    perl
-  ];
-
-  buildInputs = [
-    openssl.dev
-  ];
-
-  doCheck = false;
-
-  cargoHash = "sha256-7vN3HRBCzvXT5Xoj+ciCiy+OQ0bC8s4C5360W+1Uld0=";
-
-  postPatch =
-    let
-      # see https://github.com/risc0/risc0/blob/v1.0.5/risc0/circuit/recursion/build.rs
-      sha256Hash = "4e8496469e1efa00efb3630d261abf345e6b2905fb64b4f3a297be88ebdf83d2";
-      recursionZkr = fetchurl {
-        name = "recursion_zkr.zip";
-        url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${sha256Hash}.zip";
-        hash = "sha256-ToSWRp4e+gDvs2MNJhq/NF5rKQX7ZLTzope+iOvfg9I=";
-      };
-    in
-    ''
-      ln -sf ${recursionZkr} ./risc0/circuit/recursion/src/recursion_zkr.zip
-    '';
-
-  meta = {
-    description = "RISC Zero zero-knowledge VM";
-    homepage = "https://github.com/risc0/risc0";
-    changelog = "https://github.com/risc0/risc0/blob/${finalAttrs.src.rev}/CHANGELOG.md";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ marijanp ];
-    mainProgram = "r0vm";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b35874eec9ab..0ad48436abe4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1699,6 +1699,7 @@ mapAliases {
   quorum = throw "'quorum' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-07
   qutebrowser-qt5 = lib.warnOnInstantiate "'qutebrowser-qt5' has been removed as it depended on vulnerable and outdated qt5 webengine" qutebrowser; # Added 2026-01-14
   qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03
+  r0vm = throw "'r0vm' has been removed as the binary is provided by 'cargo-risczero'"; # Added 2026-03-25
   ra-multiplex = lib.warnOnInstantiate "'ra-multiplex' has been renamed to/replaced by 'lspmux'" lspmux; # Added 2025-10-27
   rabbit = throw "'rabbit' has been renamed to/replaced by 'rabbit-ng'"; # Added 2026-02-18
   radiance = throw "'radiance' has been removed as it was broken for a long time"; # Added 2026-01-02