From 2181b0f5fb669064dd6e5fe44f4cd2284b17ba7a Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Thu, 2 Apr 2026 00:29:55 +0800 Subject: [PATCH] gnu: Add mergiraf. * gnu/packages/version-control.scm (mergiraf): New variable. * gnu/packages/rust-crates.scm (lookup-cargo-inputs): Add entry for mergiraf. Change-Id: I4b7b16e671e8f9a99fd987410c2c57698ee35219 Signed-off-by: Efraim Flashner --- gnu/packages/rust-crates.scm | 285 +++++++++++++++++++++++++++++++ gnu/packages/version-control.scm | 24 ++- 2 files changed, 308 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm index 57bfe74dcd..9928c6474c 100644 --- a/gnu/packages/rust-crates.scm +++ b/gnu/packages/rust-crates.scm @@ -3276,6 +3276,10 @@ (crate-source "canonical-path" "2.0.2" "0vvsjda6ka5nz8zvx6r08zqi0j59sjccgcbjxj96xj764w9y1sg6")) +(define rust-caplog-0.3.0 + (crate-source "caplog" "0.3.0" + "033w5vva7hm3i1qxaykiig2jzki8ycwz0ff9d7gi9q6d71ibkp5v")) + (define rust-capnp-0.19.8 (crate-source "capnp" "0.19.8" "0vk3vxcq11v4nzxlrdfxmyr4339i1jqi4zcmi919mbnsddb5m62f")) @@ -6963,6 +6967,10 @@ (crate-source "diffy" "0.4.2" "14fjsz0gnd06fy96l1mksp7m78fv645sp19r504d1gcl072vhidm")) +(define rust-diffy-imara-0.3.2 + (crate-source "diffy-imara" "0.3.2" + "1nynh446k80q7wg67i0mwrxlfh3ja0chwh1mqsmcqdg2bqhgjaa4")) + (define rust-digest-0.10.7 (crate-source "digest" "0.10.7" "14p2n6ih29x81akj097lvz7wi9b6b9hvls0lwrv7b6xwyy0s5ncy")) @@ -14185,6 +14193,10 @@ (crate-source "indexmap" "2.0.1" "0kmi1dhkmnv937mbkzlqq9kmkdr8k5030vfk19bi8jcxy4x7q8md")) +(define rust-indexmap-2.13.1 + (crate-source "indexmap" "2.13.1" + "1zs2af09vgdaix8qzhi3bd12zpn5za7pbc6v0cc0q2ryrfws5a25")) + (define rust-indexmap-2.2.6 (crate-source "indexmap" "2.2.6" "09hgwi2ig0wyj5rjziia76zmhgfj95k0jb4ic3iiawm4vlavg3qn")) @@ -14426,6 +14438,10 @@ (crate-source "insta" "1.46.3" "1r0mc4sjayarbl5cbizk4wa0hwwakcwj836f6k5ww73zgk4bhbg8")) +(define rust-insta-1.47.2 + (crate-source "insta" "1.47.2" + "0kh9gspras3vhvx8wkygnw2wzlwjln7gwzgks8g4194kxd464jkv")) + (define rust-insta-cmd-0.6.0 (crate-source "insta-cmd" "0.6.0" "1rix5nmswns1p5p5f7pj5l9wvm69awzby0fbkkacwp4j4ylyzvpz")) @@ -14450,6 +14466,10 @@ (crate-source "instant" "0.1.13" "08h27kzvb5jw74mh0ajv0nv9ggwvgqm8ynjsn2sa9jsks4cjh970")) +(define rust-integer-sqrt-0.1.5 + (crate-source "integer-sqrt" "0.1.5" + "0w6pzmgvs1mldkhafbwg9x7wzr0af3ngkimyb1gy97jarcdw6vi7")) + (define rust-interception-sys-0.1.3 (crate-source "interception-sys" "0.1.3" "1lgwbml7gzq5a5rriy708w68gx6yiw9cdg7xy2c5vsrrck7pbs5b" @@ -18638,6 +18658,10 @@ (crate-source "nonempty" "0.9.0" "1rh8yv3l0531696d27x3fmv4ykbbi4xqwbmxs7ysr2d5l3ffypcr")) +(define rust-nonempty-collections-1.3.0 + (crate-source "nonempty-collections" "1.3.0" + "0aij92hfyxww3ndpayscl7pglq8a4isfh05c51nc66bvnc07w4ix")) + (define rust-nonzero-ext-0.3.0 (crate-source "nonzero_ext" "0.3.0" "08fghyinb07xwhbj7vwvlhg45g5cvhvld2min25njidir12rdgrq")) @@ -19565,6 +19589,10 @@ (modules '((guix build utils))) (snippet '(delete-file-recursively "tests")))) +(define rust-oneshot-0.1.13 + (crate-source "oneshot" "0.1.13" + "01x1rp6s5hxx87n2pc5101lxgdrj0gnxj45zss2qb8li4m6cm6r6")) + (define rust-onig-6.4.0 (crate-source "onig" "6.4.0" "0kyaz2fwa5dkr04rvk5ga2yv5jkqn1ymblvpdlf1gn9afb432jwc")) @@ -20438,6 +20466,10 @@ (crate-source "pathfinder_simd" "0.5.5" "0mxdnmcagfv0h18ns8kdmirgk9c1993ih6c4z7zkmgsm0fb2g45z")) +(define rust-pathfinding-3.0.14 + (crate-source "pathfinding" "3.0.14" + "04ycy0cj27xw604qcfhi626y6fvsfxcrjm0w540cawg73051jifb")) + (define rust-pathsearch-0.2.0 (crate-source "pathsearch" "0.2.0" "01bvjyighsrb5bgk8vcwlr1mjv6pqxk4n2qrkhbigaw2wp2kp66s")) @@ -29623,6 +29655,10 @@ (crate-source "trash" "5.2.2" "0wdq8ax8z47cabs7j9hkghli3pyzaxq8z18diw5dd1bd1imnqx12")) +(define rust-tree-edit-distance-0.4.0 + (crate-source "tree-edit-distance" "0.4.0" + "05icqiqa1cfm92wa7cc0p525443zrqdayk298hbk80v1yxczj767")) + (define rust-tree-house-0.3.0 (crate-source "tree-house" "0.3.0" "16drgxag73ba809hrgrscfaxj2fx5sv17p84w0d1fbrr499aa3nh")) @@ -29727,6 +29763,10 @@ (crate-source "tree-sitter-dart-orchard" "0.2.1" "1bg9j81b8lgr3m3h3fj2v4y4ai29bcpw1a9a2mxv1skbndi00v90")) +(define rust-tree-sitter-dart-orchard-0.3.2 + (crate-source "tree-sitter-dart-orchard" "0.3.2" + "0blh1abr06qxgjjs43w0j1b804gn3rxs0r1vq6mvxbslznhnik1z")) + (define rust-tree-sitter-devicetree-0.14.1 (crate-source "tree-sitter-devicetree" "0.14.1" "0sylmv12namxx3agd99154bfs5vf2r9723vmz6x2q9fqb55qgrmi")) @@ -29775,6 +29815,14 @@ (crate-source "tree-sitter-go" "0.25.0" "1shnigi37lrq88b93i1vnha62byy1nykrq62sbac0p435x6hlmn8")) +(define rust-tree-sitter-gomod-orchard-0.5.3 + (crate-source "tree-sitter-gomod-orchard" "0.5.3" + "0pb40777grgf0iwzyj9rb2v7glxc3zk0p4i2qv8gvnn6mlsccmc7")) + +(define rust-tree-sitter-gosum-orchard-0.3.2 + (crate-source "tree-sitter-gosum-orchard" "0.3.2" + "0bkmby2sm99h9icrh358zsrlm60c7mvvwr038q8ms188pq4442zj")) + (define rust-tree-sitter-haskell-0.23.1 (crate-source "tree-sitter-haskell" "0.23.1" "19057d99kaq7bn8k86baf7v4q4mjv8p5mjr7zh9vm32l0kjm2z4p")) @@ -29795,10 +29843,18 @@ (crate-source "tree-sitter-html" "0.23.2" "1vk3xyxnf3xv19qisyj2knd346dq4yjamawv6bg1w1ljbn7706r6")) +(define rust-tree-sitter-ini-1.4.0 + (crate-source "tree-sitter-ini" "1.4.0" + "0bynnbd2p5dqvf3fz13rg1d9df8239h6xjbpaw57qfym5il7jzrq")) + (define rust-tree-sitter-java-0.23.5 (crate-source "tree-sitter-java" "0.23.5" "1mlh3skj2nasrwdz0v865r4hxnk7v8037z8nwqab4yf6r36wp9ha")) +(define rust-tree-sitter-java-orchard-0.3.1 + (crate-source "tree-sitter-java-orchard" "0.3.1" + "0rw3jaf2nibm9q6gizn5v3ss2n075kqrwbdf4icl49lw6pw9al1b")) + (define rust-tree-sitter-javascript-0.23.1 (crate-source "tree-sitter-javascript" "0.23.1" "1cf19p9rl96yqjjhzimhp0dpvp2xxq8fqg2w29nc25h4krcvyh5z")) @@ -29871,6 +29927,10 @@ (crate-source "tree-sitter-ocaml" "0.23.2" "0xz3dkvb40b5anir8ld7547w2kibbms75y7i1kfhcn8p7ni09hck")) +(define rust-tree-sitter-ocaml-0.24.2 + (crate-source "tree-sitter-ocaml" "0.24.2" + "0h5nx24ffbkdswh7gv1qp5hfxfdz1wbq9i4ybxmzam9q5dcdn6bx")) + (define rust-tree-sitter-pascal-0.10.2 (crate-source "tree-sitter-pascal" "0.10.2" "1a3j9frx64azgr12m9v1j8s56x3zkxs6cxaiwhvx4gs9ayd1xddd")) @@ -29887,6 +29947,10 @@ (crate-source "tree-sitter-php" "0.24.2" "14jmvysx66irxjgpgvlp3dfw46yxfbcmrzx7x9g2q1b9mg1ig30d")) +(define rust-tree-sitter-properties-0.3.0 + (crate-source "tree-sitter-properties" "0.3.0" + "1syfhpbjafblalq6jgwmwb67ahfivg1nxfvk4mwbv2m6vqw2yv0a")) + (define rust-tree-sitter-proto-0.2.0 (crate-source "tree-sitter-proto" "0.2.0" "091rkm2psxy5gbx8db2r87pryqc836gg4zhkjz1hz65m6js60hwf")) @@ -29899,6 +29963,10 @@ (crate-source "tree-sitter-python" "0.25.0" "072anxf7f3wn2jzpa1c8fnnskhwjjkd4qvzlc2zl1rsjjv9mzy3b")) +(define rust-tree-sitter-python-orchard-0.4.2 + (crate-source "tree-sitter-python-orchard" "0.4.2" + "1971z87b8jygps6bpqkdmbar4nc5jbjl7qq3qff4317jixnz22sp")) + (define rust-tree-sitter-qmljs-0.3.0 (crate-source "tree-sitter-qmljs" "0.3.0" "0qlvkmzmwpxv7pbd3d1irj34adrls9yjx3k25ypssznd6ylmwi37")) @@ -29923,6 +29991,10 @@ (crate-source "tree-sitter-rust" "0.24.0" "1q8vqslcnp2pvyg06733ddag4i4w3jlv5s1bf8h28jk89h1ii6sb")) +(define rust-tree-sitter-rust-orchard-0.14.0 + (crate-source "tree-sitter-rust-orchard" "0.14.0" + "0nwsnn6lbz4zcdirp772g9rj57npm3fjkwfhhpkxi1di6qmkh3yz")) + (define rust-tree-sitter-rust-orchard-0.16.3 (crate-source "tree-sitter-rust-orchard" "0.16.3" "1183bzjbryz8ch8i6wm399363b6ha6zzm378k9rj7dwgpxmwsny9")) @@ -29935,6 +30007,10 @@ (crate-source "tree-sitter-scala" "0.24.0" "0ldjl3cq5rvm1d6c61nx2i2l7cwkd7l67ca5627dw3pls6rsw5km")) +(define rust-tree-sitter-scala-0.24.1 + (crate-source "tree-sitter-scala" "0.24.1" + "0acjm7lq0rgca4avcg74l4lrymssrn26s73zqz8g3z5m5103akrv")) + (define rust-tree-sitter-scheme-0.24.7 (crate-source "tree-sitter-scheme" "0.24.7" "0caiaxsl7kpcf70dksfk0x9q962n30rifpbh4rgi8f6zdcapyzla")) @@ -29951,6 +30027,10 @@ (crate-source "tree-sitter-solidity" "1.2.13" "098bm6lfws7i7rn4wiz1v598gdnh78ihpikhnq69z1vhbf3zib2f")) +(define rust-tree-sitter-starlark-1.3.0 + (crate-source "tree-sitter-starlark" "1.3.0" + "08d7qfs4a7a15wjsdhh1c9va72my7ym8i9lawag4pk45s21g4d49")) + (define rust-tree-sitter-svelte-ng-1.0.2 (crate-source "tree-sitter-svelte-ng" "1.0.2" "0dzsclhsy24d4r4a541kbnr9p8n860v8jr3cr0y3g52yrzwp22pg")) @@ -29959,6 +30039,10 @@ (crate-source "tree-sitter-swift" "0.7.1" "0n9fhg4imn0zzd4qa36gcq89nl4drd3z6dj7hvxg8g9y3h0idwjf")) +(define rust-tree-sitter-systemverilog-0.2.1 + (crate-source "tree-sitter-systemverilog" "0.2.1" + "0zsis23gf8k15nhg30bb2ivffghd2pn7lwqsafi6rfpi243npg3b")) + (define rust-tree-sitter-toml-ng-0.6.0 (crate-source "tree-sitter-toml-ng" "0.6.0" "0mblvbhba1lg59jy6b2f7n41jfxlsxv3xw3kqw16rwdchg6j0pb9")) @@ -59423,6 +59507,207 @@ rust-unicode-ident-1.0.22 rust-unicode-linebreak-0.1.5 rust-unindent-0.2.4)) + (mergiraf => + (list rust-adler2-2.0.1 + rust-aho-corasick-1.1.4 + rust-android-system-properties-0.1.5 + rust-anstream-1.0.0 + rust-anstyle-1.0.14 + rust-anstyle-parse-1.0.0 + rust-anstyle-query-1.1.5 + rust-anstyle-wincon-3.0.11 + rust-anyhow-1.0.102 + rust-arbitrary-1.4.2 + rust-arrayvec-0.7.6 + rust-autocfg-1.5.0 + rust-bitflags-2.11.0 + rust-boxcar-0.2.14 + rust-bumpalo-3.20.2 + rust-caplog-0.3.0 + rust-cc-1.2.58 + rust-cfg-if-1.0.4 + rust-chrono-0.4.44 + rust-clap-4.6.0 + rust-clap-builder-4.6.0 + rust-clap-derive-4.6.0 + rust-clap-lex-1.1.0 + rust-colorchoice-1.0.5 + rust-console-0.16.3 + rust-core-foundation-sys-0.8.7 + rust-crc32fast-1.5.0 + rust-derive-arbitrary-1.4.2 + rust-derive-more-0.99.20 + rust-derive-more-2.1.1 + rust-derive-more-impl-2.1.1 + rust-diffy-imara-0.3.2 + rust-either-1.15.0 + rust-encode-unicode-1.0.0 + rust-equivalent-1.0.2 + rust-errno-0.3.14 + rust-etcetera-0.10.0 + rust-fastrand-2.3.0 + rust-find-msvc-tools-0.1.9 + rust-fixedbitset-0.4.2 + rust-flate2-1.1.9 + rust-foldhash-0.1.5 + rust-getrandom-0.3.4 + rust-getrandom-0.4.2 + rust-glob-0.3.3 + rust-hashbrown-0.12.3 + rust-hashbrown-0.15.5 + rust-hashbrown-0.16.1 + rust-heck-0.5.0 + rust-hermit-abi-0.5.2 + rust-home-0.5.12 + rust-iana-time-zone-0.1.65 + rust-iana-time-zone-haiku-0.1.2 + rust-id-arena-2.3.0 + rust-imara-diff-0.1.8 + rust-indexmap-1.9.3 + rust-indexmap-2.13.0 + rust-insta-1.47.2 + rust-integer-sqrt-0.1.5 + rust-is-terminal-0.4.17 + rust-is-terminal-polyfill-1.70.2 + rust-itertools-0.10.5 + rust-itertools-0.14.0 + rust-itoa-1.0.18 + rust-js-sys-0.3.94 + rust-lazy-static-1.5.0 + rust-leb128fmt-0.1.0 + rust-libc-0.2.184 + rust-linux-raw-sys-0.12.1 + rust-log-0.4.29 + rust-memchr-2.8.0 + rust-miniz-oxide-0.8.9 + rust-nonempty-collections-1.3.0 + rust-nu-ansi-term-0.50.3 + rust-num-traits-0.2.19 + rust-once-cell-1.21.4 + rust-once-cell-polyfill-1.70.2 + rust-oneshot-0.1.13 + rust-pathfinding-3.0.14 + rust-ppv-lite86-0.2.21 + rust-prettyplease-0.2.37 + rust-proc-macro2-1.0.106 + rust-quote-1.0.45 + rust-r-efi-5.3.0 + rust-r-efi-6.0.0 + rust-rand-0.9.2 + rust-rand-chacha-0.9.0 + rust-rand-core-0.9.5 + rust-regex-1.12.3 + rust-regex-automata-0.4.14 + rust-regex-syntax-0.8.10 + rust-relative-path-1.9.3 + rust-rstest-0.26.1 + rust-rstest-macros-0.26.1 + rust-rustc-hash-1.1.0 + rust-rustc-hash-2.1.2 + rust-rustc-version-0.4.1 + rust-rustix-1.1.4 + rust-rustversion-1.0.22 + rust-semver-1.0.27 + rust-serde-1.0.228 + rust-serde-core-1.0.228 + rust-serde-derive-1.0.228 + rust-serde-json-1.0.149 + rust-shlex-1.3.0 + rust-simd-adler32-0.3.9 + rust-similar-2.7.0 + rust-stderrlog-0.6.0 + rust-streaming-iterator-0.1.9 + rust-strsim-0.11.1 + rust-syn-2.0.117 + rust-tempfile-3.27.0 + rust-termcolor-1.1.3 + rust-thiserror-1.0.69 + rust-thiserror-2.0.18 + rust-thiserror-impl-1.0.69 + rust-thiserror-impl-2.0.18 + rust-thread-local-1.1.9 + rust-tree-edit-distance-0.4.0 + rust-tree-sitter-0.25.10 + rust-tree-sitter-c-0.24.1 + rust-tree-sitter-c-sharp-0.23.1 + rust-tree-sitter-cmake-0.7.1 + rust-tree-sitter-cpp-0.23.4 + rust-tree-sitter-dart-orchard-0.3.2 + rust-tree-sitter-devicetree-0.14.1 + rust-tree-sitter-elixir-0.3.5 + rust-tree-sitter-go-0.25.0 + rust-tree-sitter-gomod-orchard-0.5.3 + rust-tree-sitter-gosum-orchard-0.3.2 + rust-tree-sitter-haskell-0.23.1 + rust-tree-sitter-hcl-1.1.0 + rust-tree-sitter-html-0.23.2 + rust-tree-sitter-ini-1.4.0 + rust-tree-sitter-java-orchard-0.3.1 + rust-tree-sitter-javascript-0.25.0 + rust-tree-sitter-json-0.24.8 + rust-tree-sitter-kotlin-ng-1.1.0 + rust-tree-sitter-language-0.1.7 + rust-tree-sitter-lua-0.2.0 + rust-tree-sitter-make-1.1.1 + rust-tree-sitter-md-0.5.3 + rust-tree-sitter-nix-0.3.0 + rust-tree-sitter-ocaml-0.24.2 + rust-tree-sitter-php-0.24.2 + rust-tree-sitter-properties-0.3.0 + rust-tree-sitter-python-orchard-0.4.2 + rust-tree-sitter-ruby-0.23.1 + rust-tree-sitter-rust-orchard-0.14.0 + rust-tree-sitter-scala-0.24.1 + rust-tree-sitter-solidity-1.2.13 + rust-tree-sitter-starlark-1.3.0 + rust-tree-sitter-systemverilog-0.2.1 + rust-tree-sitter-toml-ng-0.7.0 + rust-tree-sitter-typescript-0.23.2 + rust-tree-sitter-xml-0.7.0 + rust-tree-sitter-yaml-0.7.2 + rust-typed-arena-2.0.2 + rust-unicode-ident-1.0.24 + rust-unicode-xid-0.2.6 + rust-utf8parse-0.2.2 + rust-wasip2-1.0.2+wasi-0.2.9 + rust-wasip3-0.4.0+wasi-0.3.0-rc-2026-01-06 + rust-wasm-bindgen-0.2.117 + rust-wasm-bindgen-macro-0.2.117 + rust-wasm-bindgen-macro-support-0.2.117 + rust-wasm-bindgen-shared-0.2.117 + rust-wasm-encoder-0.244.0 + rust-wasm-metadata-0.244.0 + rust-wasmparser-0.244.0 + rust-winapi-util-0.1.11 + rust-windows-core-0.62.2 + rust-windows-implement-0.60.2 + rust-windows-interface-0.59.3 + rust-windows-link-0.2.1 + rust-windows-result-0.4.1 + rust-windows-strings-0.5.1 + rust-windows-sys-0.59.0 + rust-windows-sys-0.61.2 + rust-windows-targets-0.52.6 + rust-windows-aarch64-gnullvm-0.52.6 + rust-windows-aarch64-msvc-0.52.6 + rust-windows-i686-gnu-0.52.6 + rust-windows-i686-gnullvm-0.52.6 + rust-windows-i686-msvc-0.52.6 + rust-windows-x86-64-gnu-0.52.6 + rust-windows-x86-64-gnullvm-0.52.6 + rust-windows-x86-64-msvc-0.52.6 + rust-wit-bindgen-0.51.0 + rust-wit-bindgen-core-0.51.0 + rust-wit-bindgen-rust-0.51.0 + rust-wit-bindgen-rust-macro-0.51.0 + rust-wit-component-0.244.0 + rust-wit-parser-0.244.0 + rust-zerocopy-0.8.48 + rust-zerocopy-derive-0.8.48 + rust-zip-6.0.0 + rust-zlib-rs-0.6.3 + rust-zmij-1.0.21 + rust-zopfli-0.8.3)) (mitm-cache => (list rust-adler2-2.0.1 rust-aho-corasick-1.1.4 diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 1dca8d3387..bd485e563f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -53,7 +53,7 @@ ;;; Copyright © 2023 Steve George ;;; Copyright © 2023 Josselin Poiret ;;; Copyright © 2024 Hilton Chain -;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024, 2026 Zheng Junjie ;;; Copyright © 2023 Ryan Desfosses ;;; Copyright © 2024 Suhail Singh ;;; Copyright © 2024 Simon Tournier @@ -839,6 +839,28 @@ everything from small to very large projects with speed and efficiency.") ((#:configure-flags flags #~'()) (if (%current-target-system) git-cross-configure-flags #~(list))))))) +(define-public mergiraf + (package + (name "mergiraf") + (version "0.16.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "mergiraf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0b5rsdz1s68kc37rqvjwpgwj2651arigbzgcf7chdspzjc9fkllk")))) + (build-system cargo-build-system) + (arguments + (list #:install-source? #f)) + ;; for tests + (native-inputs (list git-minimal/pinned)) + (inputs (cargo-inputs 'mergiraf)) + (home-page "https://mergiraf.org/") + (synopsis "Syntax-aware merge driver for Git") + (description "This package provides a syntax-aware merge driver for Git.") + (license license:gpl3))) + (define-public python-klaus (package (name "python-klaus")