From b5c68797d333adfcdec22bc5f530a1f423ad3023 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Fri, 2 Jan 2026 12:03:10 +0100 Subject: [PATCH 1/6] cargo-codspeed: 3.0.5 -> 4.2.0 --- doc/release-notes/rl-2605.section.md | 2 ++ pkgs/by-name/ca/cargo-codspeed/package.nix | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) 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..0c17ff1eb722 100644 --- a/pkgs/by-name/ca/cargo-codspeed/package.nix +++ b/pkgs/by-name/ca/cargo-codspeed/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { 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="; + hash = "sha256-ofVgb+9YUNiCPhRZHY3Fm1nXRZK+9Uq8pc5XAm3P6oU="; }; - cargoHash = "sha256-1bFd35JScS3x0ttfSyNUgtB9xgtVUMRl4oUOn2r+t5M="; + cargoHash = "sha256-xcLs2Tdi7wp7F5Jwl1QvEC1wQeK7pBjBZKxGVrzqzu0="; nativeBuildInputs = [ curl @@ -39,6 +39,13 @@ rustPlatform.buildRustPackage rec { 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 = { From 34bc05d6ca02ff373aa499663ade0ec005c6885a Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Fri, 2 Jan 2026 12:03:59 +0100 Subject: [PATCH 2/6] cargo-codspeed: use finalAttrs pattern --- pkgs/by-name/ca/cargo-codspeed/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix index 0c17ff1eb722..0b7cdc0adac1 100644 --- a/pkgs/by-name/ca/cargo-codspeed/package.nix +++ b/pkgs/by-name/ca/cargo-codspeed/package.nix @@ -9,14 +9,14 @@ zlib, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-codspeed"; version = "4.2.0"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ofVgb+9YUNiCPhRZHY3Fm1nXRZK+9Uq8pc5XAm3P6oU="; }; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { ]; cargoBuildFlags = [ "-p=cargo-codspeed" ]; - cargoTestFlags = cargoBuildFlags; + cargoTestFlags = finalAttrs.cargoBuildFlags; checkFlags = [ # requires an extra dependency, blit "--skip=test_package_in_deps_build" @@ -63,4 +63,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ ]; mainProgram = "cargo-codspeed"; }; -} +}) From 29656ac6c5207e12e060f6114aac29c7ce63d531 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Fri, 2 Jan 2026 12:04:32 +0100 Subject: [PATCH 3/6] cargo-codspeed: reorder meta attributes --- pkgs/by-name/ca/cargo-codspeed/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix index 0b7cdc0adac1..4d18d5a28d12 100644 --- a/pkgs/by-name/ca/cargo-codspeed/package.nix +++ b/pkgs/by-name/ca/cargo-codspeed/package.nix @@ -53,14 +53,14 @@ rustPlatform.buildRustPackage (finalAttrs: { }; meta = { + changelog = "https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/${finalAttrs.src.rev}"; 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 = [ ]; }; }) From 8ed7fda1adfdc5cddca6654a8b5df175d01f0672 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Fri, 2 Jan 2026 12:06:21 +0100 Subject: [PATCH 4/6] cargo-codspeed: reorder inputs --- pkgs/by-name/ca/cargo-codspeed/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix index 4d18d5a28d12..4e90bcf5bd43 100644 --- a/pkgs/by-name/ca/cargo-codspeed/package.nix +++ b/pkgs/by-name/ca/cargo-codspeed/package.nix @@ -1,11 +1,11 @@ { - lib, - rustPlatform, - fetchFromGitHub, curl, - pkg-config, + fetchFromGitHub, + lib, libgit2, openssl, + pkg-config, + rustPlatform, zlib, }: From 84399f2e218dab223f329ffde140cf1ec21f297b Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sun, 4 Jan 2026 11:39:16 +0100 Subject: [PATCH 5/6] cargo-codspeed: use tag instead of rev --- pkgs/by-name/ca/cargo-codspeed/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix index 4e90bcf5bd43..5386d18d150e 100644 --- a/pkgs/by-name/ca/cargo-codspeed/package.nix +++ b/pkgs/by-name/ca/cargo-codspeed/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ofVgb+9YUNiCPhRZHY3Fm1nXRZK+9Uq8pc5XAm3P6oU="; }; @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { }; meta = { - changelog = "https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/${finalAttrs.src.rev}"; + 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"; license = with lib.licenses; [ From c60734ac00a5b8f14c4fe7d0c86d1206f31aae15 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sun, 4 Jan 2026 11:39:42 +0100 Subject: [PATCH 6/6] cargo-codspeed: add hythera as maintainer --- pkgs/by-name/ca/cargo-codspeed/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix index 5386d18d150e..d4d3e62f35c1 100644 --- a/pkgs/by-name/ca/cargo-codspeed/package.nix +++ b/pkgs/by-name/ca/cargo-codspeed/package.nix @@ -61,6 +61,6 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 ]; mainProgram = "cargo-codspeed"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ hythera ]; }; })