From 4fe4f51ed3486a47146df0aff1bc8b8f8e819e55 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 18 Oct 2023 10:22:18 -0400 Subject: [PATCH] starlark-rust: 0.9.0 -> 0.10.0 Diff: https://diff.rs/starlark_bin/0.9.0/0.10.0 Changelog: https://github.com/facebookexperimental/starlark-rust/blob/v0.10.0/CHANGELOG.md --- .../interpreters/starlark-rust/default.nix | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/pkgs/development/interpreters/starlark-rust/default.nix b/pkgs/development/interpreters/starlark-rust/default.nix index c83f6195bc64..bd30fb4f85ae 100644 --- a/pkgs/development/interpreters/starlark-rust/default.nix +++ b/pkgs/development/interpreters/starlark-rust/default.nix @@ -1,31 +1,19 @@ { lib , rustPlatform , fetchCrate -, fetchpatch -, stdenv }: rustPlatform.buildRustPackage rec { - pname = "starlark"; - version = "0.9.0"; + pname = "starlark-rust"; + version = "0.10.0"; src = fetchCrate { - inherit pname version; - hash = "sha256-h8TBWWw94Ka9C0W0i0aHACq6jO0QOLnLW+wTRzorHcc="; + pname = "starlark_bin"; + inherit version; + hash = "sha256-7AoNRTLyTYsUass9bMJMBUN+GrfUzEGM9cED5VsRESs="; }; - cargoHash = "sha256-OLzotKyiG0JmtjH0ckRImHMPPxfQZ+8IHZtXlo1f8+Y="; - - patches = [ - # fix test broken due to using `fetchCrate` - # https://github.com/facebookexperimental/starlark-rust/pull/78 - (fetchpatch { - name = "fix-test-rust-loc-when-tested-from-the-crate.patch"; - url = "https://github.com/facebookexperimental/starlark-rust/commit/0e4f90c77868e506268fcb6c9d37368e5b2b8cf5.patch"; - hash = "sha256-c8irAyS2IQ5C6s+0t4+hbW8aFptkwvCu9JHLyZqZsW4="; - stripLen = 1; - }) - ]; + cargoHash = "sha256-Q00JJRiubrxnI0nFQqUTbxTTB70XV93HJycjdlvV+74="; meta = with lib; { description = "A Rust implementation of the Starlark language"; @@ -33,6 +21,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/facebookexperimental/starlark-rust/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ figsoda ]; - broken = stdenv.isAarch64 || stdenv.isDarwin; + mainProgram = "starlark"; }; }