From aead36f0fd17f69d6e6e33215430805b1ffcb917 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 8 Mar 2023 15:19:09 +0800 Subject: [PATCH] update dependencies --- Cargo.lock | 263 +++++++++++++++++++++------------ flake.lock | 6 +- flake.nix | 3 - nac3artiq/Cargo.toml | 2 +- nac3core/Cargo.toml | 2 +- nac3core/src/codegen/expr.rs | 2 +- nac3core/src/codegen/mod.rs | 2 +- nac3core/src/codegen/stmt.rs | 2 +- nac3standalone/Cargo.toml | 2 +- nix/windows/default.nix | 3 - nix/windows/msys2_packages.nix | 204 ++++++++++++------------- 11 files changed, 276 insertions(+), 215 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d5710662..414c40a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,9 +77,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cc" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -89,14 +89,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "console" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] @@ -115,9 +115,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" dependencies = [ "cfg-if", "crossbeam-utils", @@ -125,9 +125,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -136,9 +136,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if", @@ -159,9 +159,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", ] @@ -201,15 +201,15 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "ena" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7402b94a93c24e742487327a7cd839dc9d36fec9de9fb25b09f2dae459f36c3" +checksum = "b2e5d13ca2353ab7d0230988629def93914a8c4015f621f9b13ed2955614731d" dependencies = [ "log", ] @@ -221,10 +221,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] -name = "fastrand" -version = "1.8.0" +name = "errno" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -300,14 +321,15 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2d6f23ffea9d7e76c53eee25dfb67bcd8fde7f1198b0855350698c9f07c780" +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "inkwell" -version = "0.1.0" -source = "git+https://github.com/TheDan64/inkwell.git#3c5d7706861aac0750b4f0c98d6fcf8a91a2ca0a" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbac11e485159a525867fb7e6aa61981453e6a72f625fde6a4ab3047b0c6dec9" dependencies = [ "either", "inkwell_internals", @@ -319,8 +341,9 @@ dependencies = [ [[package]] name = "inkwell_internals" -version = "0.6.0" -source = "git+https://github.com/TheDan64/inkwell.git#3c5d7706861aac0750b4f0c98d6fcf8a91a2ca0a" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87d00c17e264ce02be5bc23d7bff959188ec7137beddd06b8b6b05a7c680ea85" dependencies = [ "proc-macro2", "quote", @@ -350,6 +373,16 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "io-lifetimes" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +dependencies = [ + "libc", + "windows-sys 0.45.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -361,9 +394,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "lalrpop" @@ -426,10 +459,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] -name = "llvm-sys" -version = "140.0.3" +name = "linux-raw-sys" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9eda9cc6f86672152125b1e112d66ab8797b7917fb202e2faee912caa76413" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "llvm-sys" +version = "140.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fe3609d79f74a2e4e158e3eaa61c2e931cecba242a79de5529cec2f92b423b7" dependencies = [ "cc", "lazy_static", @@ -465,9 +504,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -563,9 +602,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "parking_lot" @@ -579,22 +618,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "petgraph" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", "indexmap", @@ -665,9 +704,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] @@ -757,9 +796,9 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -767,9 +806,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -814,15 +853,6 @@ version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "runkernel" version = "0.1.0" @@ -831,16 +861,30 @@ dependencies = [ ] [[package]] -name = "rustversion" -version = "1.0.11" +name = "rustix" +version = "0.36.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "scopeguard" @@ -856,18 +900,18 @@ checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "3a382c72b4ba118526e187430bb4963cd6d55051ebf13d9b25574d379cc98d20" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "1ef476a5790f0f6decbc66726b6e5d63680ed518283e64c7df415989d880954f" dependencies = [ "proc-macro2", "quote", @@ -876,9 +920,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ "itoa", "ryu", @@ -928,9 +972,9 @@ dependencies = [ [[package]] name = "string_cache" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", @@ -941,9 +985,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -952,22 +996,21 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" +checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if", "fastrand", - "libc", "redox_syscall", - "remove_dir_all", - "winapi", + "rustix", + "windows-sys 0.42.0", ] [[package]] @@ -996,18 +1039,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" dependencies = [ "proc-macro2", "quote", @@ -1077,9 +1120,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-xid" @@ -1149,46 +1192,70 @@ dependencies = [ ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.0" +name = "windows-sys" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "yaml-rust" diff --git a/flake.lock b/flake.lock index 09984265..94c4ddae 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1673345971, - "narHash": "sha256-4DfFcKLRfVUTyuGrGNNmw37IeIZSoku9tgTVmu/iD98=", + "lastModified": 1678137616, + "narHash": "sha256-T+lWTRdcYaOnZQW+Ehdlg+YldC2l9cq2GXJFPq22Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54644f409ab471e87014bb305eac8c50190bcf48", + "rev": "7edcdf7b169c33cd3eef9aba50521ce93ee666b8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bb10e064..8b97f559 100644 --- a/flake.nix +++ b/flake.nix @@ -16,9 +16,6 @@ src = self; cargoLock = { lockFile = ./Cargo.lock; - outputHashes = { - "inkwell-0.1.0" = "sha256-LYW9/KS+tmFR3aUU30D1wTo3+MedXUuavp9Mbf8NCoY="; - }; }; passthru.cargoLock = cargoLock; nativeBuildInputs = [ pkgs.python3 pkgs.llvmPackages_14.clang-unwrapped pkgs.llvmPackages_14.llvm.out llvm-nac3 ]; diff --git a/nac3artiq/Cargo.toml b/nac3artiq/Cargo.toml index 9ccea860..85075fca 100644 --- a/nac3artiq/Cargo.toml +++ b/nac3artiq/Cargo.toml @@ -17,7 +17,7 @@ nac3core = { path = "../nac3core" } nac3ld = { path = "../nac3ld" } [dependencies.inkwell] -git = "https://github.com/TheDan64/inkwell.git" +version = "0.1.1" default-features = false features = ["llvm14-0", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"] diff --git a/nac3core/Cargo.toml b/nac3core/Cargo.toml index 91083608..385f9cbb 100644 --- a/nac3core/Cargo.toml +++ b/nac3core/Cargo.toml @@ -13,7 +13,7 @@ nac3parser = { path = "../nac3parser" } lazy_static = "1.4" [dependencies.inkwell] -git = "https://github.com/TheDan64/inkwell.git" +version = "0.1.1" default-features = false features = ["llvm14-0", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"] diff --git a/nac3core/src/codegen/expr.rs b/nac3core/src/codegen/expr.rs index faff3e47..f6f01887 100644 --- a/nac3core/src/codegen/expr.rs +++ b/nac3core/src/codegen/expr.rs @@ -1046,7 +1046,7 @@ pub fn gen_expr<'ctx, 'a, G: CodeGenerator>( ctx.debug_info.2, None, ); - ctx.builder.set_current_debug_location(ctx.ctx, loc); + ctx.builder.set_current_debug_location(loc); Ok(Some(match &expr.node { ExprKind::Constant { value, .. } => { diff --git a/nac3core/src/codegen/mod.rs b/nac3core/src/codegen/mod.rs index c5ba07e8..72ba85ef 100644 --- a/nac3core/src/codegen/mod.rs +++ b/nac3core/src/codegen/mod.rs @@ -695,7 +695,7 @@ pub fn gen_func_impl<'ctx, G: CodeGenerator, F: FnOnce(&mut G, &mut CodeGenConte func_scope.as_debug_info_scope(), None ); - code_gen_context.builder.set_current_debug_location(context, loc); + code_gen_context.builder.set_current_debug_location(loc); let result = codegen_function(generator, &mut code_gen_context); diff --git a/nac3core/src/codegen/stmt.rs b/nac3core/src/codegen/stmt.rs index c5758cb6..c34f885a 100644 --- a/nac3core/src/codegen/stmt.rs +++ b/nac3core/src/codegen/stmt.rs @@ -1000,7 +1000,7 @@ pub fn gen_stmt<'ctx, 'a, G: CodeGenerator>( ctx.debug_info.2, None, ); - ctx.builder.set_current_debug_location(ctx.ctx, loc); + ctx.builder.set_current_debug_location(loc); match &stmt.node { StmtKind::Pass { .. } => {} diff --git a/nac3standalone/Cargo.toml b/nac3standalone/Cargo.toml index d814e70c..d6a32041 100644 --- a/nac3standalone/Cargo.toml +++ b/nac3standalone/Cargo.toml @@ -10,6 +10,6 @@ nac3parser = { path = "../nac3parser" } nac3core = { path = "../nac3core" } [dependencies.inkwell] -git = "https://github.com/TheDan64/inkwell.git" +version = "0.1.1" default-features = false features = ["llvm14-0", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"] diff --git a/nix/windows/default.nix b/nix/windows/default.nix index 186cedd1..eba84d84 100644 --- a/nix/windows/default.nix +++ b/nix/windows/default.nix @@ -82,9 +82,6 @@ in rec { src = ../../.; cargoLock = { lockFile = ../../Cargo.lock; - outputHashes = { - "inkwell-0.1.0" = "sha256-LYW9/KS+tmFR3aUU30D1wTo3+MedXUuavp9Mbf8NCoY="; - }; }; nativeBuildInputs = [ pkgs.wineWowPackages.stable ]; buildPhase = diff --git a/nix/windows/msys2_packages.nix b/nix/windows/msys2_packages.nix index d30ae5de..59e1974b 100644 --- a/nix/windows/msys2_packages.nix +++ b/nix/windows/msys2_packages.nix @@ -1,39 +1,45 @@ { pkgs } : [ (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libiconv-1.17-1-any.pkg.tar.zst"; - sha256 = "1pb1x5wrlmmpjdpzsc7rs5xk6ydlsd5mval0fwrqq54jf6dxdzpz"; - name = "mingw-w64-x86_64-libiconv-1.17-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-10.0.0.r234.g283e5b23a-1-any.pkg.tar.zst"; + sha256 = "1s601hn3i668p8nda14bg3sdc3j6nrqca4ns84ybp5p12xsy225w"; + name = "mingw-w64-x86_64-libwinpthread-git-10.0.0.r234.g283e5b23a-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-1.2.13-2-any.pkg.tar.zst"; - sha256 = "0v2hkq7yjyq3s0iknnd27qrpxl51g6ks5dv7mjn44cnwplqibnc6"; - name = "mingw-w64-x86_64-zlib-1.2.13-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-12.2.0-10-any.pkg.tar.zst"; + sha256 = "1hql9jmmcpdr97p2ynj45hb70az4l41hcirjk0j1xjg31m2jgfr9"; + name = "mingw-w64-x86_64-gcc-libs-12.2.0-10-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-binutils-2.39-2-any.pkg.tar.zst"; - sha256 = "15swxdp3zwqs9wvbqrc0fmchd1797qd81r7ipq3sqrrmf4bmq50g"; - name = "mingw-w64-x86_64-binutils-2.39-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zstd-1.5.4-1-any.pkg.tar.zst"; + sha256 = "0ps42vy3wjmspz4glb492x0x7g3fcgv9whx53ggl3idjwhbk46lx"; + name = "mingw-w64-x86_64-zstd-1.5.4-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-headers-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst"; - sha256 = "050vvkfcsk1r6lvai8ppc6jpyvyiv5v04ps04pgb11zs8kh94s3s"; - name = "mingw-w64-x86_64-headers-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-binutils-2.40-2-any.pkg.tar.zst"; + sha256 = "1xa3ni7qg9wzlr903lsqgqisdyvnl28kb3wz2kva21l9i7wwbs7c"; + name = "mingw-w64-x86_64-binutils-2.40-2-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-crt-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst"; - sha256 = "1z573mzjdiswizq147cagvb7xwza0qb99n7vyfncyidp1anvcgwy"; - name = "mingw-w64-x86_64-crt-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-headers-git-10.0.0.r234.g283e5b23a-1-any.pkg.tar.zst"; + sha256 = "09i1r4nyrficrv39xh60y8jayfl05xvgj9sm27cp9f97gxyz8s33"; + name = "mingw-w64-x86_64-headers-git-10.0.0.r234.g283e5b23a-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gmp-6.2.1-4-any.pkg.tar.zst"; - sha256 = "1ly6vykj87sr6l6dj986zhn5mskgjj4gv81dmz19m5vq73z56xgz"; - name = "mingw-w64-x86_64-gmp-6.2.1-4-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-crt-git-10.0.0.r234.g283e5b23a-1-any.pkg.tar.zst"; + sha256 = "1vcg8j5p0w1jqf9hncadsas6k6d9z66ci3nk4y3qhnl2sj1zz924"; + name = "mingw-w64-x86_64-crt-git-10.0.0.r234.g283e5b23a-1-any.pkg.tar.zst"; +}) + +(pkgs.fetchurl { + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gmp-6.2.1-5-any.pkg.tar.zst"; + sha256 = "1v19jx0hrsib7ak5jzbhss7p5zjg9y4kj06bcs8sakqvmyby8mlq"; + name = "mingw-w64-x86_64-gmp-6.2.1-5-any.pkg.tar.zst"; }) (pkgs.fetchurl { @@ -43,15 +49,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libwinpthread-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst"; - sha256 = "00q62a3d8sdffbsykprcg1ivxj4nyr6wlznc0vlq7jw30368vmcb"; - name = "mingw-w64-x86_64-libwinpthread-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst"; -}) - -(pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-12.2.0-7-any.pkg.tar.zst"; - sha256 = "0hb04rr0maamv0f9ns8c4w3w31aa2akvvc9ab8n3qp4hbcy1x7s6"; - name = "mingw-w64-x86_64-gcc-libs-12.2.0-7-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libiconv-1.17-3-any.pkg.tar.zst"; + sha256 = "061dlpg69ph2205xabshya827m6dqchxxn3jvhnnicja6bsb8ivh"; + name = "mingw-w64-x86_64-libiconv-1.17-3-any.pkg.tar.zst"; }) (pkgs.fetchurl { @@ -73,27 +73,27 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-winpthreads-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst"; - sha256 = "1ljkrfv1hgzdl6g60yb1b4zpdjcc8xj379xblrkvhfgj9y8pyi8c"; - name = "mingw-w64-x86_64-winpthreads-git-10.0.0.r202.g4359b3570-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-winpthreads-git-10.0.0.r234.g283e5b23a-1-any.pkg.tar.zst"; + sha256 = "018bh811zrj7fd47p4fj4fawja7n0s129ghv91rwpxif0kj6b5bf"; + name = "mingw-w64-x86_64-winpthreads-git-10.0.0.r234.g283e5b23a-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zstd-1.5.2-2-any.pkg.tar.zst"; - sha256 = "1f14wbc1yvjgv3rbwhv75391l55gcm0as6ipba20vw8phz4ax8ds"; - name = "mingw-w64-x86_64-zstd-1.5.2-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-zlib-1.2.13-3-any.pkg.tar.zst"; + sha256 = "19r9hf111zb41i7r45ixsx26l4sk8g8apryv1xgj03hq54barikz"; + name = "mingw-w64-x86_64-zlib-1.2.13-3-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-12.2.0-7-any.pkg.tar.zst"; - sha256 = "1n486mr6c2xhmn4yhv5xyapz7f7l2lajgbr1b3prc0yx1h18dwkv"; - name = "mingw-w64-x86_64-gcc-12.2.0-7-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-12.2.0-10-any.pkg.tar.zst"; + sha256 = "182560g1bl52260v8dbggybl4mir3isyad22zvkb6sndid3iaakw"; + name = "mingw-w64-x86_64-gcc-12.2.0-10-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-c-ares-1.18.1-2-any.pkg.tar.zst"; - sha256 = "1bx3x4xqsv6afdkq7as7pjcdpnhalr0lqsxg9ryx2g84iq4jy6za"; - name = "mingw-w64-x86_64-c-ares-1.18.1-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-c-ares-1.19.0-1-any.pkg.tar.zst"; + sha256 = "0h9gpqr08rpil1a4cjd2ajk2is2fzgbhwg2n7va9jl2zfxksd6my"; + name = "mingw-w64-x86_64-c-ares-1.19.0-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { @@ -109,27 +109,27 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gettext-0.21-3-any.pkg.tar.zst"; - sha256 = "1gy7fmn6jc13ipnyyq44gyhv8rvz5cy7gz1dm3wrna80hjnzli5v"; - name = "mingw-w64-x86_64-gettext-0.21-3-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gettext-0.21.1-1-any.pkg.tar.zst"; + sha256 = "17h4qnv75jns7fq54hqp375v45snmrrn451izyp2nmmr0fw2p0bc"; + name = "mingw-w64-x86_64-gettext-0.21.1-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libunistring-1.0-1-any.pkg.tar.zst"; - sha256 = "1qks1gm8jscnn93sr7n1azkzcq4a8fybsikpqcf920m9b66cym4k"; - name = "mingw-w64-x86_64-libunistring-1.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libunistring-1.1-1-any.pkg.tar.zst"; + sha256 = "1zpmarlb2j0q2hcv30xl6c0mm3pwdjp7fh9mqpb6y0yygj1ivcza"; + name = "mingw-w64-x86_64-libunistring-1.1-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libidn2-2.3.3-1-any.pkg.tar.zst"; - sha256 = "1m3qgnhgf0g389kglrai26x4k64gs2cy9b3mjwlkw5xcs2r3smww"; - name = "mingw-w64-x86_64-libidn2-2.3.3-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libidn2-2.3.4-1-any.pkg.tar.zst"; + sha256 = "0z926vsxz61m5zxdarah3zc4n253ksykxvb72qg86kcxcl3z0ppc"; + name = "mingw-w64-x86_64-libidn2-2.3.4-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libpsl-0.21.2-3-any.pkg.tar.zst"; - sha256 = "1hywa9qbcncb64p6x4kmm7ffm4l37p47yln9h0r489av665wqpr5"; - name = "mingw-w64-x86_64-libpsl-0.21.2-3-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libpsl-0.21.2-4-any.pkg.tar.zst"; + sha256 = "0scpar3qp91y920c065y7jcvzfpmxx5vva9ybgxkk4df8a8mrbs9"; + name = "mingw-w64-x86_64-libpsl-0.21.2-4-any.pkg.tar.zst"; }) (pkgs.fetchurl { @@ -151,39 +151,39 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ca-certificates-20211016-3-any.pkg.tar.zst"; - sha256 = "02x6dnbbyjm6mcl6ii61bc5rkwg3qsbaqd2lyzsp5732hxjcmmq4"; - name = "mingw-w64-x86_64-ca-certificates-20211016-3-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ca-certificates-20211016-4-any.pkg.tar.zst"; + sha256 = "0nj31jjl2qs9z209na154a6zc38zdrv9gzywdcaayd7li0rh9l7a"; + name = "mingw-w64-x86_64-ca-certificates-20211016-4-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openssl-1.1.1.s-1-any.pkg.tar.zst"; - sha256 = "0bwjrsnn54kjq2gxvmcyrngk84347pvyd6hfwq4mzxz18z15r3dx"; - name = "mingw-w64-x86_64-openssl-1.1.1.s-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-openssl-3.0.8-1-any.pkg.tar.zst"; + sha256 = "11v63md015nsqci5wnvx3cfxlminw4zhipd337xzp439bsihy11n"; + name = "mingw-w64-x86_64-openssl-3.0.8-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libssh2-1.10.0-1-any.pkg.tar.zst"; - sha256 = "1f27an41hxrfs9jifq0708c484ps3zmb582gmsy7xn5idg3wk03d"; - name = "mingw-w64-x86_64-libssh2-1.10.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libssh2-1.10.0-2-any.pkg.tar.zst"; + sha256 = "0q1l2258063b8byyh1il864nz76m1q8q820k1qds0c3n1s9zdm6f"; + name = "mingw-w64-x86_64-libssh2-1.10.0-2-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-nghttp2-1.51.0-1-any.pkg.tar.zst"; - sha256 = "077gj6y04jri9nfy77n8vncppk86yngx1cli0gb2a6bg4amzpgfk"; - name = "mingw-w64-x86_64-nghttp2-1.51.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-nghttp2-1.52.0-1-any.pkg.tar.zst"; + sha256 = "0w0z9a8ahhij2sdqyxkynahi71w69kw6pw692fwc7vcxjnd1bj2v"; + name = "mingw-w64-x86_64-nghttp2-1.52.0-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-curl-7.87.0-1-any.pkg.tar.zst"; - sha256 = "0y4mwsl79z2a7djcgrpjm6bvs84wzhs1kfmdvqsgfdy1c0ryalcp"; - name = "mingw-w64-x86_64-curl-7.87.0-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-curl-7.88.1-1-any.pkg.tar.zst"; + sha256 = "1y7xpmyf1dbfkmd7l7wwh7l7f576ww96hw56yi0w736zlz83nddz"; + name = "mingw-w64-x86_64-curl-7.88.1-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-xz-5.2.9-1-any.pkg.tar.zst"; - sha256 = "1aiv10aldz9gq0yzcm36sf46h84hgm7012dacs90b5l8axk86pwn"; - name = "mingw-w64-x86_64-xz-5.2.9-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-xz-5.4.1-1-any.pkg.tar.zst"; + sha256 = "0n1dfc5cy9ya13mp8hx5pm0qskb1q6dkl6mhmvz4kaynw7c94p6y"; + name = "mingw-w64-x86_64-xz-5.4.1-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { @@ -193,9 +193,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-rust-1.66.1-1-any.pkg.tar.zst"; - sha256 = "1fn2rvgrly0r9zj4275pbrvz1ilrp4j2l3sazv8pwz4l26ddyldi"; - name = "mingw-w64-x86_64-rust-1.66.1-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-rust-1.67.1-1-any.pkg.tar.zst"; + sha256 = "1kr5gyajy1r8hqnv90fdlqysm0i5kl3p0d62pmpj7xf16mkvhzsx"; + name = "mingw-w64-x86_64-rust-1.67.1-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { @@ -241,9 +241,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libarchive-3.6.2-1-any.pkg.tar.zst"; - sha256 = "1x44xbh2sbqjn68iywb28qgflkpps51l07wqnavs7yanw4svkslb"; - name = "mingw-w64-x86_64-libarchive-3.6.2-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libarchive-3.6.2-2-any.pkg.tar.zst"; + sha256 = "1j8rm8zk0b7wg20cbw3f0nll7m42clk5m1gl163m5a83r4s8wmnn"; + name = "mingw-w64-x86_64-libarchive-3.6.2-2-any.pkg.tar.zst"; }) (pkgs.fetchurl { @@ -252,6 +252,12 @@ name = "mingw-w64-x86_64-libuv-1.44.2-2-any.pkg.tar.zst"; }) +(pkgs.fetchurl { + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ninja-1.11.1-3-any.pkg.tar.zst"; + sha256 = "0494d54qxax9d2gz11vhm7342311k4s6mf6zy5yq2ka07qfzckcg"; + name = "mingw-w64-x86_64-ninja-1.11.1-3-any.pkg.tar.zst"; +}) + (pkgs.fetchurl { url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-rhash-1.4.3-1-any.pkg.tar.zst"; sha256 = "1nd0iqlx1vmn079i24i07r4kqfr3yr0apnzsgcx8qd5cyvwnl7w6"; @@ -259,15 +265,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ninja-1.11.1-2-any.pkg.tar.zst"; - sha256 = "0d0hxjqgfwrh4rz7apgjfdirjph18zc55amr01903ifd1kwsvsbr"; - name = "mingw-w64-x86_64-ninja-1.11.1-2-any.pkg.tar.zst"; -}) - -(pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-cmake-3.25.1-2-any.pkg.tar.zst"; - sha256 = "1n9bp8i4k1948nfjbhdscm8czfkqhgjc1s863rnyiifcbkfb86h2"; - name = "mingw-w64-x86_64-cmake-3.25.1-2-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-cmake-3.25.2-1-any.pkg.tar.zst"; + sha256 = "0qz7mcl2p0lghbi7hmlb1am0vbac9xiyr22hr0w37fpiz3i5l072"; + name = "mingw-w64-x86_64-cmake-3.25.2-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { @@ -277,9 +277,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ncurses-6.3-6-any.pkg.tar.zst"; - sha256 = "1847q7ydrbkvfzrkyywph5lh1kgj44mqchmhjsmafis86m2rswib"; - name = "mingw-w64-x86_64-ncurses-6.3-6-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-ncurses-6.4.20230211-1-any.pkg.tar.zst"; + sha256 = "0h62y3c45bkff6z3aa8ailz2l16x3s9g3pbyifqx6kwwzv80crgp"; + name = "mingw-w64-x86_64-ncurses-6.4.20230211-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { @@ -301,9 +301,9 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-sqlite3-3.40.1-1-any.pkg.tar.zst"; - sha256 = "1knsg7my1z0n0d96yn6n50mk40z5493yi7lzyx8rbx8d5wvzagwr"; - name = "mingw-w64-x86_64-sqlite3-3.40.1-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-sqlite3-3.41.0-1-any.pkg.tar.zst"; + sha256 = "13168pp7w1wzkabd0vl7khxaq367rkizjf07cfixgn025c22zs0y"; + name = "mingw-w64-x86_64-sqlite3-3.41.0-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { @@ -319,15 +319,15 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-3.10.9-1-any.pkg.tar.zst"; - sha256 = "1vbmgdjyhkll64v8nn6ajzd03q1nxp9wav934z27jmrbjp9z2xkh"; - name = "mingw-w64-x86_64-python-3.10.9-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-3.10.10-1-any.pkg.tar.zst"; + sha256 = "14whllm3cs0lsx9l158jzdvh476ri74l7yxdhr4a4js1s65hkyx1"; + name = "mingw-w64-x86_64-python-3.10.10-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-12.2.0-7-any.pkg.tar.zst"; - sha256 = "18fbcn8rcnryhy0f5r2gyyk62x4ycv5m4kbhqllvxj7g9d521mhp"; - name = "mingw-w64-x86_64-gcc-libgfortran-12.2.0-7-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-12.2.0-10-any.pkg.tar.zst"; + sha256 = "1xilwrasyj3xbrv4wjvc53bv45k7szpzgnnakdnl1jg81960byx5"; + name = "mingw-w64-x86_64-gcc-libgfortran-12.2.0-10-any.pkg.tar.zst"; }) (pkgs.fetchurl { @@ -337,14 +337,14 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-numpy-1.23.5-1-any.pkg.tar.zst"; - sha256 = "1kh381jzjbw4nxriqcmi8phs6fc80im48dg0cyqrkf64rqwgkj5w"; - name = "mingw-w64-x86_64-python-numpy-1.23.5-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-numpy-1.24.2-1-any.pkg.tar.zst"; + sha256 = "1dzfvhvzfhcmi9jx163qiaqaalj92xn09cf12dwyndjh2vrabipc"; + name = "mingw-w64-x86_64-python-numpy-1.24.2-1-any.pkg.tar.zst"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-setuptools-65.6.3-1-any.pkg.tar.zst"; - sha256 = "1gnvm13j5cw8r9kpx1sy45ygmml3ywz3nprsqrg2z0bpjyl3whq8"; - name = "mingw-w64-x86_64-python-setuptools-65.6.3-1-any.pkg.tar.zst"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-setuptools-67.5.0-1-any.pkg.tar.zst"; + sha256 = "11n3ijx4gmam42qd1nwmcgf6n0n1xysqblibkp4mv428j9rbj7rp"; + name = "mingw-w64-x86_64-python-setuptools-67.5.0-1-any.pkg.tar.zst"; }) ]