diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index fc34a120d84d..5388280ecc98 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -18,6 +18,8 @@ adding `pkg-config`, `xfce4-dev-tools`, and `wrapGAppsHook3` to your `nativeBuildInputs` and `--enable-maintainer-mode` to your `configureFlags`. +- `cargo-codspeed` has been updated from `3.0.5` to `4.2.0`. Version `4.0.0` includes breaking changes. For more information read the [changelog for 4.0.0](https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/v4.0.0). + - `corepack_latest` has been removed, as Corepack is no longer distributed with Node.js. - `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained. diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix index 93c12ae25c80..d4d3e62f35c1 100644 --- a/pkgs/by-name/ca/cargo-codspeed/package.nix +++ b/pkgs/by-name/ca/cargo-codspeed/package.nix @@ -1,26 +1,26 @@ { - lib, - rustPlatform, - fetchFromGitHub, curl, - pkg-config, + fetchFromGitHub, + lib, libgit2, openssl, + pkg-config, + rustPlatform, zlib, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-codspeed"; - version = "3.0.5"; + version = "4.2.0"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; - rev = "v${version}"; - hash = "sha256-vQGPROaTkEwvKw+4aPpS1whUwfeqBcYWJTIKm4KnIiw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ofVgb+9YUNiCPhRZHY3Fm1nXRZK+9Uq8pc5XAm3P6oU="; }; - cargoHash = "sha256-1bFd35JScS3x0ttfSyNUgtB9xgtVUMRl4oUOn2r+t5M="; + cargoHash = "sha256-xcLs2Tdi7wp7F5Jwl1QvEC1wQeK7pBjBZKxGVrzqzu0="; nativeBuildInputs = [ curl @@ -35,10 +35,17 @@ rustPlatform.buildRustPackage rec { ]; cargoBuildFlags = [ "-p=cargo-codspeed" ]; - cargoTestFlags = cargoBuildFlags; + cargoTestFlags = finalAttrs.cargoBuildFlags; checkFlags = [ # requires an extra dependency, blit "--skip=test_package_in_deps_build" + + # requires criteron, which requires additional dependencies + "--skip=test_cargo_config_rustflags" + + # requires additional dependencies + "--skip=test_criterion_build_and_run_filtered_by_name" + "--skip=test_criterion_build_and_run_filtered_by_name_single" ]; env = { @@ -46,14 +53,14 @@ rustPlatform.buildRustPackage rec { }; meta = { + changelog = "https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/v${finalAttrs.version}"; description = "Cargo extension to build & run your codspeed benchmarks"; homepage = "https://github.com/CodSpeedHQ/codspeed-rust"; - changelog = "https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/${src.rev}"; license = with lib.licenses; [ mit asl20 ]; - maintainers = [ ]; mainProgram = "cargo-codspeed"; + maintainers = with lib.maintainers; [ hythera ]; }; -} +})