Merge pull request #208172 from figsoda/difftastic

difftastic: 0.39.0 -> 0.40.0
This commit is contained in:
figsoda 2022-12-29 21:58:07 -05:00 committed by GitHub
commit 60351e048d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -9,24 +9,24 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "difftastic"; pname = "difftastic";
version = "0.39.0"; version = "0.40.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wilfred"; owner = "wilfred";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-PyjgnO5LXV0UGNqpb2J39Ni077L5MjHc5ZkK/r8//II="; sha256 = "sha256-zLps/R3KMx51eGdHINmvq9Cv4JTkVSont3Gktwgxsrg=";
}; };
depsExtraArgs = { depsExtraArgs = {
postBuild = let postBuild = let
mimallocPatch = (fetchpatch { mimallocPatch = fetchpatch {
name = "mimalloc-older-macos-fixes.patch"; name = "mimalloc-older-macos-fixes.patch";
url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch"; url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch";
stripLen = 1; stripLen = 1;
extraPrefix = "libmimalloc-sys/c_src/mimalloc/"; extraPrefix = "libmimalloc-sys/c_src/mimalloc/";
sha256 = "1cqgay6ayzxsj8v1dy8405kwd8av34m4bjc84iyg9r52amlijbg4"; sha256 = "1cqgay6ayzxsj8v1dy8405kwd8av34m4bjc84iyg9r52amlijbg4";
}); };
in '' in ''
pushd $name pushd $name
patch -p1 < ${mimallocPatch} patch -p1 < ${mimallocPatch}
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
popd popd
''; '';
}; };
cargoSha256 = "sha256-jVs5KokgofAqhNLfr/RJ9qOHwBYMnkqc2EcAFezS9/0="; cargoSha256 = "sha256-kVJwGEY0TvsKzTbcSgOSWIhx8MbH/KNB3Q8KvQfhCac=";
passthru.tests.version = testers.testVersion { package = difftastic; }; passthru.tests.version = testers.testVersion { package = difftastic; };