From cf5a6537f2e2b725a298421be2bb11777b7e46e9 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 28 Dec 2024 15:41:12 +0100 Subject: [PATCH 1/2] cargo-semver-checks: 0.34.0 -> 0.38.0 (cherry picked from commit 64674918d88d19783d820674681c03f8ad846daf) --- .../ca/cargo-semver-checks/package.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix index b01afc4e4bd36..5b6c36a5ec8b0 100644 --- a/pkgs/by-name/ca/cargo-semver-checks/package.nix +++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.34.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-U7ykTLEuREe2GTVswcAw3R3h4zbkWxuI2dt/2689xSA="; + hash = "sha256-IcKjiKFvkFvu8+LFCAmm39AGUaUdK8zhtNzzSb8VPE0="; }; - cargoHash = "sha256-NoxYHwY5XpRiqrOjQsaSWQCXFalNAS9SchaKwHbB2uU="; + cargoHash = "sha256-QfJ7QnGKmbrGDwYtVyAJNNGoAukD97/tmCwAROvWBIg="; nativeBuildInputs = [ cmake @@ -37,15 +37,20 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # requires internet access "--skip=detects_target_dependencies" + "--skip=query::tests_lints::feature_missing" ]; preCheck = '' + # requires internet access + rm -r test_crates/feature_missing + patchShebangs scripts/regenerate_test_rustdocs.sh - substituteInPlace scripts/regenerate_test_rustdocs.sh \ - --replace-fail \ - 'TOPLEVEL="$(git rev-parse --show-toplevel)"' \ - "TOPLEVEL=$PWD" scripts/regenerate_test_rustdocs.sh + + substituteInPlace test_outputs/integration_snapshots__bugreport.snap \ + --replace-fail \ + 'cargo-semver-checks [VERSION] ([HASH])' \ + 'cargo-semver-checks ${version}' ''; meta = with lib; { From e012c5bac50da2b82f753944a1b6b0ce6e96554c Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 28 Dec 2024 15:47:25 +0100 Subject: [PATCH 2/2] cargo-semver-checks: refactor (cherry picked from commit ce0e60c0ae841437bba1a2119e6dd9c32fd6ead0) --- pkgs/by-name/ca/cargo-semver-checks/package.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix index 5b6c36a5ec8b0..f9bf755ec48c9 100644 --- a/pkgs/by-name/ca/cargo-semver-checks/package.nix +++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix @@ -6,7 +6,9 @@ zlib, stdenv, darwin, - git, + testers, + cargo-semver-checks, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -16,7 +18,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-IcKjiKFvkFvu8+LFCAmm39AGUaUdK8zhtNzzSb8VPE0="; }; @@ -53,16 +55,21 @@ rustPlatform.buildRustPackage rec { 'cargo-semver-checks ${version}' ''; - meta = with lib; { + passthru = { + tests.version = testers.testVersion { package = cargo-semver-checks; }; + updateScript = nix-update-script { }; + }; + + meta = { description = "Tool to scan your Rust crate for semver violations"; mainProgram = "cargo-semver-checks"; homepage = "https://github.com/obi1kenobi/cargo-semver-checks"; changelog = "https://github.com/obi1kenobi/cargo-semver-checks/releases/tag/v${version}"; - license = with licenses; [ + license = with lib.licenses; [ mit # or asl20 ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ figsoda matthiasbeyer ];