difftastic: 0.62.0 -> 0.63.0 and modernize (#381237)
This commit is contained in:
Generated
-1514
File diff suppressed because it is too large
Load Diff
@@ -1,57 +1,47 @@
|
||||
{
|
||||
lib,
|
||||
fetchpatch,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
difftastic,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
mimallocPatch = fetchpatch {
|
||||
# fixes compilation error on x86_64-darwin
|
||||
# remove after update to libmimalloc-sys >= 0.1.29
|
||||
# (fixed in mimalloc >= 1.7.6 which is included with libmimalloc-sys >= 0.1.29)
|
||||
url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch";
|
||||
hash = "sha256-DK0LqsVXXiEVQSQCxZ5jyZMg0UJJx9a/WxzCroYSHZc=";
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "difftastic";
|
||||
version = "0.62.0";
|
||||
version = "0.63.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wilfred";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-AAnlopJTb+tjkACISK9OC0k59BDt+8michzt37P1lL8=";
|
||||
repo = "difftastic";
|
||||
tag = version;
|
||||
hash = "sha256-BxWCSkSeDyiiGBY2u0ahPrIhYq2lbujoPPtZGq/OkI0=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-kIqaZ8truDivMV6uo1+j9bmXQReREZjHSr89ZvVDWCw=";
|
||||
|
||||
# skip flaky tests
|
||||
checkFlags = [
|
||||
"--skip=options::tests::test_detect_display_width"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patch -d $cargoDepsCopy/libmimalloc-sys-0.1.24/c_src/mimalloc \
|
||||
-p1 < ${mimallocPatch}
|
||||
'';
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/difft";
|
||||
versionCheckProgramArg = "--version";
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = difftastic; };
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Syntax-aware diff";
|
||||
homepage = "https://github.com/Wilfred/difftastic";
|
||||
changelog = "https://github.com/Wilfred/difftastic/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [
|
||||
ethancedwards8
|
||||
figsoda
|
||||
matthiasbeyer
|
||||
defelo
|
||||
];
|
||||
mainProgram = "difft";
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user