From ada37d96c35f00a67f2eb12d24624073396dfa09 Mon Sep 17 00:00:00 2001 From: pjotrp Date: Wed, 16 Sep 2026 21:16:13 +0000 Subject: gn: add seqwish-latest (0.7.12 Rust rewrite); use in pangenomes-latest - 53 new crate-source stanzas generated by 'guix import crate -f Cargo.lock seqwish' (v0.7.12 tag, commit aab5bee); includes ragc workspace git origins at c2d7ac2f. - (seqwish-latest =>) cargo-inputs table (167 crates). - seqwish-latest package: cargo-build-system; copies ragc workspace into ragc-workspace/ and rewrites the git dep to a path; sets SEQWISH_GIT_VERSION so --version reports v0.7.12-1-gaab5bee; pkg-config + zstd native inputs for zstd-sys. - pangenomes-latest now replaces seqwish with seqwish-latest. --- gn/packages/pangenome-rust.scm | 278 +++++++++++++++++++++++++++++++++++++++++ gn/packages/pangenome.scm | 3 +- 2 files changed, 280 insertions(+), 1 deletion(-) diff --git a/gn/packages/pangenome-rust.scm b/gn/packages/pangenome-rust.scm index d3aeb50..346a686 100644 --- a/gn/packages/pangenome-rust.scm +++ b/gn/packages/pangenome-rust.scm @@ -3418,6 +3418,182 @@ sequences to accelerate the alignment process.") (file-name (git-file-name "GFAffix" "460e0dd7")) (sha256 (base32 "1cz3wisqd776jyh1scpa9i0mmnj9ywlm4m0jkvz6mmvjiyk0622v")))) +;; Crate sources for seqwish 0.7.12 (generated by: +;; guix import crate -f Cargo.lock seqwish). +(define rust-autocfg-1.5.1 + (crate-source "autocfg" "1.5.1" + "0lqasy5i30flcgih1b50kvsk6z32g09r1q4ql7q81pj6228jy0zj")) +(define rust-bitvec-1.1.1 + (crate-source "bitvec" "1.1.1" + "0dqq44v9877q0xbl4g6aaaf3xhh3m1ca7ag0iy4l17ap5k8w7knx")) +(define rust-bumpalo-3.20.3 + (crate-source "bumpalo" "3.20.3" + "0jc6va3nwcqikm7chnpdv1s87my3gs2j7g1sc7g3k91brg3arxbj")) +(define rust-cc-1.3.0 + (crate-source "cc" "1.3.0" + "1f27b93qhs65bjq04ljwgwxf8xq2qbba4j1k99cv9d9qav88i5f8")) +(define rust-clap-4.6.4 + (crate-source "clap" "4.6.4" + "1dz5brl39xchkml0khm348i87w89misprlinmnk77vwjawa0q7nr")) +(define rust-clap-builder-4.6.2 + (crate-source "clap_builder" "4.6.2" + "12sl6fyj6w2djxj0lsc1lkj1h3wpx74fjhb37izvaf65vjpji5ph")) +(define rust-clap-derive-4.6.4 + (crate-source "clap_derive" "4.6.4" + "0qd0v7pa2arwxjjinmjim6xrjy61bc28m1yryhc7zjjssswx44nh")) +(define rust-crossbeam-channel-0.5.16 + (crate-source "crossbeam-channel" "0.5.16" + "17k72dh5qqkh0xvqzr27wny7gl1l7fgzlvh2xxx71jmfgz1n6lyq")) +(define rust-crossbeam-deque-0.8.7 + (crate-source "crossbeam-deque" "0.8.7" + "1sqcxia1mmz2fw8ba1v72jjrvbkvg7c6sz9l3sl07sv1gggf10ai")) +(define rust-crossbeam-epoch-0.9.20 + (crate-source "crossbeam-epoch" "0.9.20" + "0gzg0v8in20iajikalg5i5qgpp0m26r426f0fs8nwk953w218s9d")) +(define rust-crossbeam-queue-0.3.13 + (crate-source "crossbeam-queue" "0.3.13" + "09ksdjzqk1iadmsfnz46f1qvy6bbqri91hnvyklqpn097gxi6gc0")) +(define rust-crossbeam-utils-0.8.22 + (crate-source "crossbeam-utils" "0.8.22" + "05vwf7pmjq8c8f3fp5qqdm0z3cnk4p62wi8spf0jms5yjnh3v031")) +(define rust-dashmap-6.2.1 + (crate-source "dashmap" "6.2.1" + "1705w9fx4g30287dx2b0xlmy86l29hnvipba2y5cfq920rf1sdp6")) +(define rust-either-1.16.0 + (crate-source "either" "1.16.0" + "17k7jfbdz7k440h6lws9baz8p9zlxgb41sig3w81h80nwzsjyqli")) +(define rust-fm-index-0.3.1 + (crate-source "fm-index" "0.3.1" + "0hcnqrzhivibzav4wc4r3c1y9z0r4ngvkgibfkxb449wvhicg6wi")) +(define rust-futures-core-0.3.33 + (crate-source "futures-core" "0.3.33" + "1iqdbvcdlplfr2g43h7xrfkv2sg5p1a26x8acz1xgxl07i3hrm9c")) +(define rust-futures-task-0.3.33 + (crate-source "futures-task" "0.3.33" + "02f1y1yvjg1cv998zkgl1706pi9y4fyc9045l1hlmyqyhclfscdj")) +(define rust-futures-util-0.3.33 + (crate-source "futures-util" "0.3.33" + "1anyg40j5www5l22r2jbn1birsafz4q1w9qmcjk4vqzwasi90ym7")) +(define rust-hashbrown-0.17.1 + (crate-source "hashbrown" "0.17.1" + "0jmqz7i4yl6cm7rbn0i2ffkfrmwi6xkmzkaldr2v8bcsx2v0jngd")) +(define rust-jobserver-0.1.35 + (crate-source "jobserver" "0.1.35" + "1crwgbb0wjph42ni4hqryjxlv4vlr0hyk81g76id9fpa56ysq00w")) +(define rust-js-sys-0.3.103 + ;; TODO REVIEW: Check bundled sources. + (crate-source "js-sys" "0.3.103" + "00lib0b6hqmw56r2hjp7xrv730qacslirbkdlhvmi39zvgy4pd2k")) +(define rust-log-0.4.33 + (crate-source "log" "0.4.33" + "1bd9dmk22pxgnf0h0slba6rz99zb0a0b2mdhpk8p92bp26ycbvhc")) +(define rust-memchr-2.8.3 + (crate-source "memchr" "2.8.3" + "161xa63ipfanf8v3nb82xd5hqgydv55nzw59wyngqbz6alfaz2yg")) +(define rust-memmap2-0.9.11 + (crate-source "memmap2" "0.9.11" + "1h4qnzgarnn488ljjpg9ns5y4bw0sq0xv0fj0iqywagjnz8rw8fi")) +(define rust-pin-project-lite-0.2.17 + (crate-source "pin-project-lite" "0.2.17" + "1kfmwvs271si96zay4mm8887v5khw0c27jc9srw1a75ykvgj54x8")) +(define rust-portable-atomic-1.14.0 + (crate-source "portable-atomic" "1.14.0" + "1hyfma9n2cs2ibazpfwrbv61zwg7cv86g0pr5yjkg07qgr4xa81x")) +(define rust-ragc-common-0.1.1.c2d7ac2 + ;; TODO REVIEW: Define standalone package if this is a workspace. + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AndreaGuarracino/ragc") + (commit "c2d7ac2f40b80bab7b17b3c038f755f061dd5593"))) + (file-name (git-file-name "rust-ragc-common" "0.1.1.c2d7ac2")) + (sha256 (base32 "1j3pn5lv46f1jmjdvcr395ifw0bf44ki95b01p099znf1ljl00r4")))) +(define rust-ragc-core-0.1.1.c2d7ac2 + ;; TODO REVIEW: Define standalone package if this is a workspace. + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AndreaGuarracino/ragc") + (commit "c2d7ac2f40b80bab7b17b3c038f755f061dd5593"))) + (file-name (git-file-name "rust-ragc-core" "0.1.1.c2d7ac2")) + (sha256 (base32 "1j3pn5lv46f1jmjdvcr395ifw0bf44ki95b01p099znf1ljl00r4")))) +(define rust-regex-1.13.1 + (crate-source "regex" "1.13.1" + "1391a0a4100ik8cp7l577p3ip3haqq03rd9c5vdr7vcfdixj687h")) +(define rust-regex-automata-0.4.16 + (crate-source "regex-automata" "0.4.16" + "1b8ihxq99g3hr8mr37bvhib4bfn8rlmpmp0wjg2q1j50plvdpkwg")) +(define rust-regex-syntax-0.8.11 + (crate-source "regex-syntax" "0.8.11" + "1m25h5q2wp976fb9gc3dsc9l99svcvd5cri8lncb51c46ydgzxnn")) +(define rust-rustc-hash-2.1.3 + (crate-source "rustc-hash" "2.1.3" + "0bbla578m87qmf3yr55q49l97gxn7z0ha1dwqlnvwwc58ad7y7kb")) +(define rust-rustversion-1.0.23 + (crate-source "rustversion" "1.0.23" + "07z2a843fs80fawwflj9jwn49k9b0bd0dhhbvy0ar69vaxd72m6g")) +(define rust-serde-1.0.229 + (crate-source "serde" "1.0.229" + "1fp04fq4a79bpm61xz1zy0pbz4kpc7d771zii1k3inmszq55jj21")) +(define rust-serde-core-1.0.229 + (crate-source "serde_core" "1.0.229" + "0j1ajiha76h3nmd976il9li6975k121xa7jb39ws8n0yqp4s5p37")) +(define rust-serde-derive-1.0.229 + (crate-source "serde_derive" "1.0.229" + "0j4k63i7h1bikxwz2c89ig0hrwbnl9mz1czn85xx99x5cc9dg9g7")) +(define rust-serde-json-1.0.151 + (crate-source "serde_json" "1.0.151" + "051zww7lvpw147vvwss1ng6w587qyrkzg75fvj08q2dfrmgbahf8")) +(define rust-simd-adler32-0.3.10 + (crate-source "simd-adler32" "0.3.10" + "1sny4y2qa5mwyxx5x59ln2p02vsdh92004njlslnx98imjc9489s")) +(define rust-slab-0.4.12 + (crate-source "slab" "0.4.12" + "1xcwik6s6zbd3lf51kkrcicdq2j4c1fw0yjdai2apy9467i0sy8c")) +(define rust-smallvec-1.15.2 + (crate-source "smallvec" "1.15.2" + "143wzbqf6vgapdp2z4qpl0yvlqcn17s8cnk8m28rqly808zsdmlf")) +(define rust-syn-3.0.3 + (crate-source "syn" "3.0.3" + "18srnql3cd39j9q6hf1az02p67rlr1rf6njx9zx4vxj9i3jvmsak")) +(define rust-typenum-1.20.1 + (crate-source "typenum" "1.20.1" + "086s9ly0906kw5yw41249fba97w5zfxf03pyfwdkffvcprqfixdn")) +(define rust-vers-vecs-1.10.1 + (crate-source "vers-vecs" "1.10.1" + "0q78s1rdvnly0r3cz8pba4rcg28k5q3qckmpg99lr1bzx783a16c")) +(define rust-wasip2-1.0.4+wasi-0.2.12 + (crate-source "wasip2" "1.0.4+wasi-0.2.12" + "11wl7lqwq4pbmlmzr6n7bwz0hzy1z6sxc4554bkmrr86w4vznzmn")) +(define rust-wasm-bindgen-0.2.126 + (crate-source "wasm-bindgen" "0.2.126" + "197rma4qg1kb8l4bl7857pgszzval8s1w740g9myyjh92467q1jb")) +(define rust-wasm-bindgen-macro-0.2.126 + (crate-source "wasm-bindgen-macro" "0.2.126" + "1cda6wl5zyiy7777cfgrix7fhpaqba55l5zpqj4zig7ng7jyaz0n")) +(define rust-wasm-bindgen-macro-support-0.2.126 + (crate-source "wasm-bindgen-macro-support" "0.2.126" + "03iq412frl2py55skwb3ya08xha0cf6q22zr5kqlwbr675w7r6gk")) +(define rust-wasm-bindgen-shared-0.2.126 + (crate-source "wasm-bindgen-shared" "0.2.126" + "097a3kbjls447s1lwr41l21x5crrh5vq3h6zsxccz7slrjq4q6yw")) +(define rust-web-sys-0.3.103 + ;; TODO REVIEW: Check bundled sources. + (crate-source "web-sys" "0.3.103" + "0hb1zdnrp99p5r5q66jagsddmwha460yv2wklvzrzk0b3jvdq8l6")) +(define rust-wit-bindgen-0.57.1 + (crate-source "wit-bindgen" "0.57.1" + "0vjk2jb593ri9k1aq4iqs2si9mrw5q46wxnn78im7hm7hx799gqy")) +(define rust-zerocopy-0.8.55 + (crate-source "zerocopy" "0.8.55" + "1swncvj53zi9yr08b9ddhfrcmlrmh6ijxzxcr3p6w3qlgg6hb8dm")) +(define rust-zerocopy-derive-0.8.55 + (crate-source "zerocopy-derive" "0.8.55" + "1sr8w9zc62lxmw7v6n89nxvqlki48b0nyfpyri6dd367f3xpds8g")) +(define rust-zmij-1.0.23 + (crate-source "zmij" "1.0.23" + "06zwri21nnrl34rwinmvbciap8yk1mrl8qfg9pff7lgspc56sri9")) + (define-public impg (let ((commit "41dfff4f42d1a4b418b5ab9b3b6147542e4a81a5") (revision "2")) @@ -4020,6 +4196,64 @@ maps useful in haplotype-based genotyping.") size, keeping nested bubbles when parent bubbles are popped.") (license license:expat)))) +(define-public seqwish-latest + ;; seqwish 0.7.12, the Rust rewrite (the pre-0.7.12 C++ implementation + ;; lives in the C++ package above). Only non-registry dependency is the + ;; ragc workspace, provided as a git origin. + (let ((commit "aab5beeb8d734134dfb7cc0c44fc5a38cb580a4b") + (revision "1")) + (package + (name "seqwish") + (version (git-version "0.7.12" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pangenome/seqwish") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19kifn9qs6hip282zdvkccdkb53wy86ly7q4w9bbdn68li4xg135")))) + (build-system cargo-build-system) + (arguments + (list + #:install-source? #f + #:tests? #f ; integration tests build large graphs + #:phases + #~(modify-phases %standard-phases + #$%rust-tuning-phase + ;; build.rs embeds `git describe` output via + ;; SEQWISH_GIT_VERSION (read with option_env!); there is no + ;; .git in the build tree, so set it explicitly. + (add-before 'build 'set-build-version + (lambda _ + (setenv "SEQWISH_GIT_VERSION" "v0.7.12-1-gaab5bee"))) + ;; The ragc workspace root has no [package] so crate-src? + ;; returns #f and configure skips it. Copy it manually. + (add-before 'build 'copy-ragc-workspace + (lambda* (#:key inputs #:allow-other-keys) + (let ((src (assoc-ref inputs + "rust-ragc-core-0.1.1.c2d7ac2-checkout"))) + (copy-recursively src "ragc-workspace")))) + (add-before 'build 'fix-dependency-sources + (lambda _ + (substitute* "Cargo.toml" + ;; ragc-core is a workspace member; it pulls + ;; ragc-common via its own relative path dependency. + (("ragc-core = \\{ git = \"https://github.com/AndreaGuarracino/ragc\", rev = \"c2d7ac2f40b80bab7b17b3c038f755f061dd5593\" \\}") + "ragc-core = { path = \"ragc-workspace/ragc-core\" }"))))))) + (native-inputs (list pkg-config)) + (inputs (cons* (list zstd "lib") + (cargo-inputs 'seqwish-latest #:module '(gn packages pangenome-rust)))) + (properties '((tunable? . #t))) + (home-page "https://github.com/pangenome/seqwish") + (synopsis "Alignment to variation graph inducer") + (description "seqwish implements a lossless conversion from pairwise +alignments between sequences to a variation graph encoding the sequences and +their alignments. It consumes a FASTA and a PAF file and emits the graph as +GFA. Since 0.7.12 seqwish is implemented in Rust.") + (license license:expat)))) + (define-cargo-inputs lookup-cargo-inputs (cigzip => (list rust-adler2-2.0.1 @@ -5910,6 +6144,50 @@ size, keeping nested bubbles when parent bubbles are popped.") rust-zerovec-0.11.6 rust-zerovec-derive-0.11.3 rust-zlib-rs-0.6.3)) + + (seqwish-latest => + (list rust-adler2-2.0.1 rust-ahash-0.8.12 rust-aho-corasick-1.1.4 rust-allocator-api2-0.2.21 + rust-anes-0.1.6 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.104 rust-arbitrary-chunks-0.4.1 + rust-autocfg-1.5.1 rust-bincode-1.3.3 rust-bitflags-2.13.1 rust-bitvec-1.1.1 + rust-block-buffer-0.10.4 rust-block-pseudorand-0.1.2 rust-bumpalo-3.20.3 rust-byteorder-1.5.0 + rust-cast-0.3.0 rust-cbindgen-0.27.0 rust-cc-1.3.0 rust-cfg-if-1.0.4 + rust-chiapos-chacha8-0.1.0 rust-ciborium-0.2.2 rust-ciborium-io-0.2.2 rust-ciborium-ll-0.2.2 + rust-clap-4.6.4 rust-clap-builder-4.6.2 rust-clap-derive-4.6.4 rust-clap-lex-1.1.0 + rust-colorchoice-1.0.5 rust-cpufeatures-0.2.17 rust-crc32fast-1.5.0 rust-criterion-0.5.1 + rust-criterion-plot-0.5.0 rust-crossbeam-0.8.4 rust-crossbeam-channel-0.5.16 rust-crossbeam-deque-0.8.7 + rust-crossbeam-epoch-0.9.20 rust-crossbeam-queue-0.3.13 rust-crossbeam-utils-0.8.22 rust-crunchy-0.2.4 + rust-crypto-common-0.1.7 rust-dashmap-6.2.1 rust-digest-0.10.7 rust-either-1.16.0 + rust-equivalent-1.0.2 rust-errno-0.3.14 rust-fastrand-2.5.0 rust-find-msvc-tools-0.1.9 + rust-flate2-1.1.9 rust-fm-index-0.3.1 rust-funty-2.0.0 rust-futures-core-0.3.33 + rust-futures-task-0.3.33 rust-futures-util-0.3.33 rust-generic-array-0.14.7 rust-getrandom-0.3.4 + rust-getrandom-0.4.3 rust-half-2.7.1 rust-hashbrown-0.14.5 rust-hashbrown-0.17.1 + rust-heck-0.4.1 rust-heck-0.5.0 rust-hermit-abi-0.5.2 rust-iitree-rs-0.1.1 + rust-indexmap-2.14.0 rust-is-terminal-0.4.17 rust-is-terminal-polyfill-1.70.2 rust-itertools-0.10.5 + rust-itoa-1.0.18 rust-jobserver-0.1.35 rust-js-sys-0.3.103 rust-libc-0.2.189 + rust-linux-raw-sys-0.12.1 rust-lock-api-0.4.14 rust-log-0.4.33 rust-memchr-2.8.3 + rust-memmap2-0.9.11 rust-miniz-oxide-0.8.9 rust-nanorand-0.6.1 rust-num-cpus-1.17.0 + rust-num-traits-0.2.19 rust-once-cell-1.21.4 rust-once-cell-polyfill-1.70.2 rust-oorandom-11.1.5 + rust-parking-lot-0.12.5 rust-parking-lot-core-0.9.12 rust-partition-0.1.2 rust-pin-project-lite-0.2.17 + rust-pkg-config-0.3.33 rust-plotters-0.3.7 rust-plotters-backend-0.3.7 rust-plotters-svg-0.3.7 + rust-portable-atomic-1.14.0 rust-proc-macro2-1.0.107 rust-quote-1.0.47 rust-r-efi-5.3.0 + rust-r-efi-6.0.0 rust-radium-0.7.0 rust-ragc-common-0.1.1.c2d7ac2 rust-ragc-core-0.1.1.c2d7ac2 + rust-rayon-1.12.0 rust-rayon-core-1.13.0 rust-rdst-0.20.14 rust-redox-syscall-0.5.18 + rust-regex-1.13.1 rust-regex-automata-0.4.16 rust-regex-syntax-0.8.11 rust-rustc-hash-2.1.3 + rust-rustix-1.1.4 rust-rustversion-1.0.23 rust-same-file-1.0.6 rust-scopeguard-1.2.0 + rust-serde-1.0.229 rust-serde-core-1.0.229 rust-serde-derive-1.0.229 rust-serde-json-1.0.151 + rust-serde-spanned-0.6.9 rust-sha2-0.10.9 rust-shlex-2.0.1 rust-simd-adler32-0.3.10 + rust-slab-0.4.12 rust-smallvec-1.15.2 rust-strsim-0.11.1 rust-sucds-0.8.3 + rust-syn-2.0.119 rust-syn-3.0.3 rust-tap-1.0.1 rust-tempfile-3.27.0 + rust-thiserror-1.0.69 rust-thiserror-impl-1.0.69 rust-tikv-jemalloc-sys-0.5.4+5.3.0-patched rust-tikv-jemallocator-0.5.4 + rust-tinytemplate-1.2.1 rust-toml-0.8.23 rust-toml-datetime-0.6.11 rust-toml-edit-0.22.27 + rust-toml-write-0.1.2 rust-typenum-1.20.1 rust-uf-rush-0.1.1 rust-unicode-ident-1.0.24 + rust-utf8parse-0.2.2 rust-vers-vecs-1.10.1 rust-version-check-0.9.5 rust-voracious-radix-sort-1.2.0 + rust-walkdir-2.5.0 rust-wasip2-1.0.4+wasi-0.2.12 rust-wasm-bindgen-0.2.126 rust-wasm-bindgen-macro-0.2.126 + rust-wasm-bindgen-macro-support-0.2.126 rust-wasm-bindgen-shared-0.2.126 rust-web-sys-0.3.103 rust-winapi-util-0.1.11 + rust-windows-link-0.2.1 rust-windows-sys-0.61.2 rust-winnow-0.7.15 rust-wit-bindgen-0.57.1 + rust-wyz-0.5.1 rust-zerocopy-0.8.55 rust-zerocopy-derive-0.8.55 rust-zmij-1.0.23 + rust-zstd-0.13.3 rust-zstd-safe-7.2.4 rust-zstd-sys-2.0.16+zstd.1.5.7)) (impop => (list rust-adler2-2.0.1 rust-ahash-0.8.12 diff --git a/gn/packages/pangenome.scm b/gn/packages/pangenome.scm index 12a4d6a..3348557 100644 --- a/gn/packages/pangenome.scm +++ b/gn/packages/pangenome.scm @@ -1998,7 +1998,8 @@ kfilt, miniprot, pangene, wally, and vcfbub.") (propagated-inputs (modify-inputs (package-propagated-inputs pangenomes) (replace "impg" impg-latest) - (replace "cosigt" cosigt-latest))))) + (replace "cosigt" cosigt-latest) + (replace "seqwish" seqwish-latest))))) (define-public impop ;; Population-genomics tools for implicit pangenomes (impop_k suite). -- cgit 1.4.1