From 159ef16e4a6041d29ede67e24a4a1122f37f6566 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 11 Feb 2026 00:17:14 +0100 Subject: [PATCH] xq: unbreak by bumping onig cargo dep fixes https://hydra.nixos.org/build/319845012 --- pkgs/by-name/xq/xq/0000-update-onig.patch | 39 +++++++++++++++++++++++ pkgs/by-name/xq/xq/package.nix | 5 ++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/xq/xq/0000-update-onig.patch diff --git a/pkgs/by-name/xq/xq/0000-update-onig.patch b/pkgs/by-name/xq/xq/0000-update-onig.patch new file mode 100644 index 000000000000..0ebebc76e1e6 --- /dev/null +++ b/pkgs/by-name/xq/xq/0000-update-onig.patch @@ -0,0 +1,39 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 65e50c9..2fae299 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,6 +1,6 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] + name = "aho-corasick" +@@ -880,11 +880,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + + [[package]] + name = "onig" +-version = "6.4.0" ++version = "6.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" ++checksum = "336b9c63443aceef14bea841b899035ae3abe89b7c486aaf4c5bd8aafedac3f0" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.6.0", + "libc", + "once_cell", + "onig_sys", +@@ -892,9 +892,9 @@ dependencies = [ + + [[package]] + name = "onig_sys" +-version = "69.8.1" ++version = "69.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" ++checksum = "c7f86c6eef3d6df15f23bcfb6af487cbd2fed4e5581d58d5bf1f5f8b7f6727dc" + dependencies = [ + "cc", + "pkg-config", diff --git a/pkgs/by-name/xq/xq/package.nix b/pkgs/by-name/xq/xq/package.nix index 6e4bee799e69..560b34e17fd7 100644 --- a/pkgs/by-name/xq/xq/package.nix +++ b/pkgs/by-name/xq/xq/package.nix @@ -13,7 +13,10 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Qe+crretlKJRoNPO2+aHxCmMO9MecqGjOuvdhr4a0NU="; }; - cargoHash = "sha256-q8kVyj31Ne8ddMm2Q3Z/VB10SCxrq/65PH08mmtFCu4="; + cargoPatches = [ + ./0000-update-onig.patch + ]; + cargoHash = "sha256-ACWbgGkKIn/+wPHx0dP+B0r2KDuKI4hunPwQavl6Xdo="; meta = { description = "Pure rust implementation of jq";