Your message dated Tue, 25 Aug 2026 15:33:51 +0000
with message-id <[email protected]>
and subject line Bug#1144938: fixed in hx
25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2
has caused the Debian Bug report #1144938,
regarding hx: port to gix 0.86
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1144938: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1144938
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: hx
Version: 25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds-4
Severity: important
Tags: patch
User: [email protected]
Usertags: gix-0.86
X-Debbugs-Cc: [email protected]
Dear maintainer,
I am preparing a rust-gix transition to 0.86, which will likely be uploaded in
the coming days.
hx depends on gix 0.83, so it needs a dependency bump and a small port.
I have attached a debdiff fixing this.
Best regards,
Simon Quigley
[email protected]
diff -Nru hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/changelog
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/changelog
--- hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/changelog
2026-07-03 03:56:50.000000000 -0500
+++ hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/changelog
2026-08-20 11:25:55.000000000 -0500
@@ -1,3 +1,10 @@
+hx (25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds-4.1) UNRELEASED;
urgency=medium
+
+ * Non-maintainer upload.
+ * Relax gix to 0.86 via 2002_newer_gix.patch, removing the old patch.
+
+ -- Simon Quigley <[email protected]> Thu, 20 Aug 2026 11:25:55 -0500
+
hx (25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds-4) unstable;
urgency=medium
* no-changes source-only upload to enable testing migration
diff -Nru
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_newer_gix.patch
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_newer_gix.patch
---
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_newer_gix.patch
1969-12-31 18:00:00.000000000 -0600
+++
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_newer_gix.patch
2026-08-20 11:25:55.000000000 -0500
@@ -0,0 +1,37 @@
+Description: Relax gix to 0.86
+Author: Simon Quigley <[email protected]>
+Origin: vendor
+Forwarded: no
+Last-Update: 2026-08-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/helix-vcs/Cargo.toml
++++ b/helix-vcs/Cargo.toml
+@@ -17,7 +17,7 @@ tokio = { version = "1", features = ["rt
+ parking_lot.workspace = true
+ arc-swap.workspace = true
+
+-gix = { version = "0.84.0", features = ["attributes", "status",
"max-performance", "sha1"], default-features = false, optional = true }
++gix = { version = "0.86.0", features = ["attributes", "status",
"max-performance", "sha1"], default-features = false, optional = true }
+ imara-diff = "0.1.8"
+ anyhow = "1"
+
+--- a/helix-vcs/src/git.rs
++++ b/helix-vcs/src/git.rs
+@@ -1,6 +1,6 @@
+ use anyhow::{bail, Context, Result};
+ use arc_swap::ArcSwap;
+-use gix::filter::plumbing::driver::apply::Delay;
++use gix::filter::plumbing::{driver::apply::Delay,
pipeline::convert::to_worktree::Options};
+ use std::io::Read;
+ use std::path::Path;
+ use std::sync::Arc;
+@@ -56,7 +56,7 @@ pub fn get_diff_base(file: &Path, trust_
+ let rela_path = gix::path::try_into_bstr(rela_path)?;
+ let (mut pipeline, _) = repo.filter_pipeline(None)?;
+ let mut worktree_outcome =
+- pipeline.convert_to_worktree(&data, rela_path.as_ref(),
Delay::Forbid)?;
++ pipeline.convert_to_worktree(&data, rela_path.as_ref(), Options {
can_delay: Delay::Forbid, ..Default::default() })?;
+ let mut buf = Vec::with_capacity(data.len());
+ worktree_outcome.read_to_end(&mut buf)?;
+ Ok(buf)
diff -Nru
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_gix.patch
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_gix.patch
---
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_gix.patch
2026-06-14 17:31:54.000000000 -0500
+++
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_gix.patch
1969-12-31 18:00:00.000000000 -0600
@@ -1,19 +0,0 @@
-Description: accept older minor version of crate gix
-Author: Jonas Smedegaard <[email protected]>
-Author: Junyong Liang <[email protected]>
-Bug-Debian: https://bugs.debian.org/1116062
-Forwarded: not-needed
-Last-Update: 2026-06-15
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/helix-vcs/Cargo.toml
-+++ b/helix-vcs/Cargo.toml
-@@ -17,7 +17,7 @@
- parking_lot.workspace = true
- arc-swap.workspace = true
-
--gix = { version = "0.84.0", features = ["attributes", "status",
"max-performance", "sha1"], default-features = false, optional = true }
-+gix = { version = ">= 0.83.0, <= 0.84", features = ["attributes", "status",
"max-performance", "sha1"], default-features = false, optional = true }
- imara-diff = "0.2.0"
- anyhow = "1"
-
diff -Nru
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_imara-diff.patch
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_imara-diff.patch
---
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_imara-diff.patch
2026-06-14 17:15:34.000000000 -0500
+++
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/2002_older_imara-diff.patch
2026-08-20 11:25:55.000000000 -0500
@@ -19,10 +19,10 @@
chrono = { version = "0.4", default-features = false, features = ["alloc",
"std"] }
--- a/helix-vcs/Cargo.toml
+++ b/helix-vcs/Cargo.toml
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,7 @@ parking_lot.workspace = true
arc-swap.workspace = true
- gix = { version = ">= 0.83.0, <= 0.84", features = ["attributes", "status",
"max-performance", "sha1"], default-features = false, optional = true }
+ gix = { version = "0.84.0", features = ["attributes", "status",
"max-performance", "sha1"], default-features = false, optional = true }
-imara-diff = "0.2.0"
+imara-diff = "0.1.8"
anyhow = "1"
diff -Nru
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/series
hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/series
--- hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/series
2026-06-24 09:53:30.000000000 -0500
+++ hx-25.07.1+20260624+ds+~0.3.3+ds+~0.4.0+20260607+ds/debian/patches/series
2026-08-20 11:25:55.000000000 -0500
@@ -10,13 +10,13 @@
2002_older_chardetng.patch
2002_older_dashmap.patch
2002_older_etcetera.patch
-2002_older_gix.patch
2002_older_hashbrown.patch
2002_older_imara-diff.patch
2002_older_open.patch
2002_older_regex-automata.patch
2002_older_signal-hook.patch
2002_older_signal-hook-tokio.patch
+2002_newer_gix.patch
2003_avoid_sonic_rs.patch
2004_perl.patch
2005_deb-built-using.patch
OpenPGP_signature.asc
Description: OpenPGP digital signature
--- End Message ---
--- Begin Message ---
Source: hx
Source-Version: 25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2
Done: Jonas Smedegaard <[email protected]>
We believe that the bug you reported is fixed in the latest version of
hx, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jonas Smedegaard <[email protected]> (supplier of updated hx package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Tue, 25 Aug 2026 16:59:14 +0200
Source: hx
Architecture: source
Version: 25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2
Distribution: unstable
Urgency: medium
Maintainer: Jonas Smedegaard <[email protected]>
Changed-By: Jonas Smedegaard <[email protected]>
Closes: 1144938
Changes:
hx (25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2) unstable;
urgency=medium
.
* relax build-dependencies for crates
chardetng gix hashbrown imara-diff signal-hook signal-hook-tokio
* add patch 1002_newer_gix to use newer minor version of crate gix,
superseding patch 2002_older_gix;
relax build-dependency for crate gix;
closes: bug#1144938, thanks to Simon Quigley
* update copyright info: update coverage
* add patch 1002_newer_signal-hook
to accept newer minor version of crate signal-hook,
superseding patches
2002_older_signal-hook 2002_older_signal-hook-tokio;
tighten build-dependencies for crates signal-hook signal-hook-tokio
Checksums-Sha1:
83c38cf517196adcc9948a8cdb15d8201516caf3 4883
hx_25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2.dsc
cf8a52b0b85b32e2a91943eb2e8dff9c61fe33a9 33672
hx_25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2.debian.tar.xz
03ecc65d18e06e5d2ea8215250df014a5df1e531 45385
hx_25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2_amd64.buildinfo
Checksums-Sha256:
65a4c512c32c55863c16e0e2bc8c87734c81802b8c8d918189c79f842e15b4d6 4883
hx_25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2.dsc
2ca5cc1148d0d3fac9ce28516e256e3da22c55c0b13913de5475294b28a917ae 33672
hx_25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2.debian.tar.xz
85d0577dec55e2efb4a0d910ffc63e22d20c03da77957c7b02d5d18c85f49b28 45385
hx_25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2_amd64.buildinfo
Files:
a920278b53b31e248633af49b38668a9 4883 editors optional
hx_25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2.dsc
3f777eceaafe0788b3a890e561ef7bd9 33672 editors optional
hx_25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2.debian.tar.xz
bc5ad38df68c7b9305cb4dd0181e3296 45385 editors optional
hx_25.07.1+20260723+ds+~0.3.3+ds+~0.4.0+20260627+ds-2_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJABAEBCgAqFiEEn+Ppw2aRpp/1PMaELHwxRsGgASEFAmqNsdEMHGRyQGpvbmVz
LmRrAAoJECx8MUbBoAEh6vgP/2gWrHVUkAfTcBZHGTBq6Nfa1YwkCWuPU3jCQTzZ
lRaTE60p2U6EEgpO2mtV64rjktnzgIZDbDSaArveO9OBPMB4BPx7oC1iJAb5qX+/
hxGvyRdA6FIfpyC8SuZIuHB3vgNj7FbtXXEAQ9U2qfSqab31cdLI+Nevwk7Bvr9U
gm+dUqsThrmkuy5ZO/OPlTL+2G5EmZHy295BLojJ/3TDECLQhWl8AXBIuOdFAy8W
ZGz8Q3ZjelZdHOQTyqHqRSSHoT0c/bbszx5er67V+E1p/Ivbud5FgiP+DMjLlpv4
Q7evSUGiisjTaYxjKpHt7Y1ikG/2u2y9yexPVvfCHWAmr+QhpPQYVUsioa+N5eJf
wgJUuQ8uc8JYnnukxeyxce8iRVMLxta/vX4XCz7Ens45cix+ID1DTr74T3Mw7KVH
QGvwigt5yDpP+p/6DKihq/0xTZ5XcbILBs9gxkqK0BHre3Wbgzh8vRI5t5nW+qNh
1Z9RnfwdiYRidB3jAzQYNl9aC5uOgsitYNDHdKPr4JDpjHraGgkElpjCDJCNWGOv
CZuK+V319PTcew6uIbtqIJFJg9surAcnnPPvtYZ8j2/xeb22SdItXb/G5BgGczv8
0NpbrgyAUcsD+tFq80Rf8OnBDyglDCnuEbo5W4DevEtKTdVlt7gWbwLzWiLdcFMc
SrPf
=r05r
-----END PGP SIGNATURE-----
pgpDMJldVTGcV.pgp
Description: PGP signature
--- End Message ---
