From d15cdb8d5108a531c8bc99b12a711f4346257397 Mon Sep 17 00:00:00 2001 From: isabel Date: Fri, 13 Sep 2024 13:21:29 +0100 Subject: [PATCH 1/2] biome: move to pkgs/by-name --- .../tools/biome/default.nix => by-name/bi/biome/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/biome/default.nix => by-name/bi/biome/package.nix} (100%) diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/by-name/bi/biome/package.nix similarity index 100% rename from pkgs/development/tools/biome/default.nix rename to pkgs/by-name/bi/biome/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85fb98cb0f44..1e1d9dab165e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6692,8 +6692,6 @@ with pkgs; biodiff = callPackage ../development/tools/biodiff { }; - biome = callPackage ../development/tools/biome { }; - biosdevname = callPackage ../tools/networking/biosdevname { }; bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { }; From 946f90c22777d255e6033903a5fa9dc8c15df37b Mon Sep 17 00:00:00 2001 From: isabel Date: Fri, 13 Sep 2024 13:22:00 +0100 Subject: [PATCH 2/2] biome: 1.8.3 -> 1.9.0 --- pkgs/by-name/bi/biome/package.nix | 57 +++++++++++++++++-------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index aa8a2855882f..c37b4f6f66e5 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -1,46 +1,50 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, libgit2 -, rust-jemalloc-sys -, zlib -, stdenv -, darwin -, git +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libgit2, + rust-jemalloc-sys, + zlib, + stdenv, + darwin, + git, }: - rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "cli/v${version}"; - hash = "sha256-6/RYuaR4HBXLI7eKysyRcSOxONFlChpQuhzWHAlx2CM="; + hash = "sha256-AVw7yhC/f5JkFw2sQZ5YgzeXXjoJ8BfGgsS5sRVV/wE="; }; - cargoHash = "sha256-ytGbiDamxkTCPjNTBMsW1YjK+qMZfktGG5mVUVdKV5I="; + cargoHash = "sha256-Vz6GCDGdC2IUtBK5X/t/Q5LODFUSlUxPBTCIjgdw3XU="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libgit2 - rust-jemalloc-sys - zlib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = + [ + libgit2 + rust-jemalloc-sys + zlib + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; nativeCheckInputs = [ git ]; cargoBuildFlags = [ "-p=biome_cli" ]; - cargoTestFlags = cargoBuildFlags ++ + cargoTestFlags = + cargoBuildFlags + ++ # skip a broken test from v1.7.3 release # this will be removed on the next version [ "-- --skip=diagnostics::test::termination_diagnostic_size" ]; @@ -58,12 +62,15 @@ rustPlatform.buildRustPackage rec { unset BIOME_VERSION ''; - meta = with lib; { + meta = { description = "Toolchain of the web"; homepage = "https://biomejs.dev/"; changelog = "https://github.com/biomejs/biome/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + figsoda + isabelroses + ]; mainProgram = "biome"; }; }