From d799792ca5336a6cfb8fb81de54169502ec633dd Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 3 Jan 2026 14:28:40 +0100 Subject: [PATCH 1/3] uutils-diffutils: fix `meta.changelog` --- pkgs/by-name/uu/uutils-diffutils/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/uu/uutils-diffutils/package.nix b/pkgs/by-name/uu/uutils-diffutils/package.nix index f5dbfa5d0270..5935d7a9ce95 100644 --- a/pkgs/by-name/uu/uutils-diffutils/package.nix +++ b/pkgs/by-name/uu/uutils-diffutils/package.nix @@ -25,12 +25,10 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=ed_diff::tests::test_permutations_empty_lines" ]; - passthru = { - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/uutils/diffutils/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/uutils/diffutils/releases/tag/v${finalAttrs.version}"; description = "Drop-in replacement of diffutils in Rust"; homepage = "https://github.com/uutils/diffutils"; license = lib.licenses.mit; From 4acf066ddfb9e6136d1a5bf1b3ef94fafb4c2bb7 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 3 Jan 2026 13:36:07 +0000 Subject: [PATCH 2/3] uutils-diffutils: 0.4.2 -> 0.5.0 Changelog: https://github.com/uutils/diffutils/releases/tag/v0.5.0 Diff: https://github.com/uutils/diffutils/compare/v0.4.2...v0.5.0 --- pkgs/by-name/uu/uutils-diffutils/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uu/uutils-diffutils/package.nix b/pkgs/by-name/uu/uutils-diffutils/package.nix index 5935d7a9ce95..46eb979f6d15 100644 --- a/pkgs/by-name/uu/uutils-diffutils/package.nix +++ b/pkgs/by-name/uu/uutils-diffutils/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-diffutils"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "uutils"; repo = "diffutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-IAgrCkhUC2Tkh+OM1lorpmD0GpsHUauLgU0KcmsvKb4="; + hash = "sha256-YZAa4A5fvW8BcaZn4xSVbSnzyoAaKKqBzpFOjnSRnc4="; }; - cargoHash = "sha256-SiZIp0rJXl0ZqKaxLPtV1nypxSqKXW+NoFLxCVpW4OY="; + cargoHash = "sha256-jX3uuUopNaVi+XNskBUPzITlJrsVkXWR8LP7PTuwMm8="; checkFlags = [ # called `Result::unwrap()` on an `Err` value: Os { code: 2, kind: NotFound, message: "No such file or directory" } @@ -25,6 +25,11 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=ed_diff::tests::test_permutations_empty_lines" ]; + postInstall = '' + ln -s $out/bin/diffutils $out/bin/cmp + ln -s $out/bin/diffutils $out/bin/diff + ''; + passthru.updateScript = nix-update-script { }; meta = { From b87358b0a2d8f904eb2798534d8797c48ded7e35 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 3 Jan 2026 14:49:55 +0100 Subject: [PATCH 3/3] uutils-diffutils: add installCheckPhase --- pkgs/by-name/uu/uutils-diffutils/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/uu/uutils-diffutils/package.nix b/pkgs/by-name/uu/uutils-diffutils/package.nix index 46eb979f6d15..0650e85b415a 100644 --- a/pkgs/by-name/uu/uutils-diffutils/package.nix +++ b/pkgs/by-name/uu/uutils-diffutils/package.nix @@ -30,6 +30,15 @@ rustPlatform.buildRustPackage (finalAttrs: { ln -s $out/bin/diffutils $out/bin/diff ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/diffutils 2>/dev/null | head -1 | grep -F 'diffutils ${finalAttrs.version}' + + runHook postInstallCheck + ''; + passthru.updateScript = nix-update-script { }; meta = {