From 34bdc20e8354ed141bc201898b07583418ea9fc1 Mon Sep 17 00:00:00 2001 From: isabel Date: Mon, 24 Mar 2025 19:59:02 +0000 Subject: [PATCH 1/2] biome: 1.9.4 -> 2.0.0 --- pkgs/by-name/bi/biome/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index b5eaa405d1c5..bfc9a1cc12ec 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.9.4"; + version = "2.0.0"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; - rev = "cli/v${version}"; - hash = "sha256-oK1tCPoTeUHvVdi+ym4J5xEj2NIi2zHQpNU1KUchQfY="; + rev = "@biomejs/biome@${finalAttrs.version}"; + hash = "sha256-2oHEaHKTyD+j34Or/Obb0pPGpEXEgSq6wowyYVV6DqI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-lo4IAStdv1CW/cQYzRDLzDwsDqCwoo5xKen2Rti9kPU="; + cargoHash = "sha256-jh7LlX7Ip2oy5NcXHfFkGeyJVGeu4Y0HqN690bok+/E="; nativeBuildInputs = [ pkg-config ]; @@ -34,17 +34,20 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p=biome_cli" ]; cargoTestFlags = cargoBuildFlags ++ [ + # fails due to cargo insta "-- --skip=commands::check::print_json" "--skip=commands::check::print_json_pretty" "--skip=commands::explain::explain_logs" "--skip=commands::format::print_json" "--skip=commands::format::print_json_pretty" "--skip=commands::format::should_format_files_in_folders_ignored_by_linter" + "--skip=cases::migrate_v2::should_successfully_migrate_sentry" ]; env = { BIOME_VERSION = version; LIBGIT2_NO_VENDOR = 1; + INSTA_UPDATE = "no"; }; preCheck = '' From bac1e0dc714dccadc5c5f21b8c8f1a5bbb3ea20d Mon Sep 17 00:00:00 2001 From: isabel Date: Wed, 30 Apr 2025 12:23:02 +0100 Subject: [PATCH 2/2] biome: migrate to finalAttrs --- pkgs/by-name/bi/biome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index bfc9a1cc12ec..82232fc576a7 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -8,7 +8,7 @@ zlib, gitMinimal, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "biome"; version = "2.0.0"; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ gitMinimal ]; cargoBuildFlags = [ "-p=biome_cli" ]; - cargoTestFlags = cargoBuildFlags ++ [ + cargoTestFlags = finalAttrs.cargoBuildFlags ++ [ # fails due to cargo insta "-- --skip=commands::check::print_json" "--skip=commands::check::print_json_pretty" @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { ]; env = { - BIOME_VERSION = version; + BIOME_VERSION = finalAttrs.version; LIBGIT2_NO_VENDOR = 1; INSTA_UPDATE = "no"; }; @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Toolchain of the web"; homepage = "https://biomejs.dev/"; - changelog = "https://github.com/biomejs/biome/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/biomejs/biome/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ figsoda @@ -69,4 +69,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "biome"; }; -} +})