cargo-risczero: 0.17.0 -> 1.1.2 (#353953)

This commit is contained in:
Austin Horstman 2024-11-07 08:13:09 -06:00 committed by GitHub
commit c161297510
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 54 additions and 42 deletions

View File

@ -0,0 +1,54 @@
{
lib,
stdenv,
fetchCrate,
fetchurl,
rustPlatform,
pkg-config,
openssl,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-risczero";
version = "1.1.2";
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
};
env = {
RECURSION_SRC_PATH = src-recursion;
};
cargoHash = "sha256-pNgnUtKn2w5rWbgDi0MHZCm9nYPgESL3g7EMaYwoSq4=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
];
# The tests require network access which is not available in sandboxed Nix builds.
doCheck = false;
passthru.updateScript = nix-update-script { };
meta = {
description = "Cargo extension to help create, manage, and test RISC Zero projects";
mainProgram = "cargo-risczero";
homepage = "https://risczero.com";
license = with lib.licenses; [ asl20 ];
maintainers = with lib.maintainers; [ cameronfyfe ];
};
}

View File

@ -1,41 +0,0 @@
{ lib
, stdenv
, fetchCrate
, rustPlatform
, pkg-config
, openssl
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-risczero";
version = "0.17.0";
src = fetchCrate {
inherit pname version;
hash = "sha256-UXCZ4l45zcyn2AnfDW6dNdEnXCWL2waNwDTbermgS6M=";
};
cargoHash = "sha256-KkV+ZQAPegbeZKj3ixDSFQEyKwkKeMYceSc27xGtQms=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
openssl
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Security
];
# The tests require network access which is not available in sandboxed Nix builds.
doCheck = false;
meta = with lib; {
description = "Cargo extension to help create, manage, and test RISC Zero projects";
mainProgram = "cargo-risczero";
homepage = "https://risczero.com";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ cameronfyfe ];
};
}

View File

@ -15469,7 +15469,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-readme = callPackage ../development/tools/rust/cargo-readme { };
cargo-risczero = callPackage ../development/tools/rust/cargo-risczero { };
cargo-run-bin = callPackage ../development/tools/rust/cargo-run-bin {};
cargo-semver-checks = callPackage ../development/tools/rust/cargo-semver-checks { };