From c1224a6eecc70956abb6753e76e0d0392613fc1a Mon Sep 17 00:00:00 2001 From: Soispha Date: Mon, 24 Jul 2023 17:18:43 +0200 Subject: [PATCH] Build: Lock file maintenance --- Cargo.lock | 254 ++++++++++++++++++++++++++++++++++++++++++----------- flake.lock | 49 ++++++++++- 2 files changed, 249 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c5ca408..431b90d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -139,19 +139,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", "syn 2.0.26", +======= + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) ] [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", "syn 2.0.26", +======= + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) ] [[package]] @@ -228,6 +238,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "blake3" version = "1.4.1" @@ -400,7 +416,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -436,9 +452,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "a385f5d34e5eff161df2369056a3fd194fcabd8a64ce0eed02de09fcb3203434" [[package]] name = "cpufeatures" @@ -486,7 +502,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossterm_winapi", "libc", "mio", @@ -557,7 +573,11 @@ dependencies = [ "fnv", "ident_case", "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", +======= + "quote 1.0.32", +>>>>>>> 94386bf (Build: Lock file maintenance) "strsim", "syn 1.0.109", ] @@ -569,7 +589,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", +<<<<<<< HEAD "quote 1.0.31", +======= + "quote 1.0.32", +>>>>>>> 94386bf (Build: Lock file maintenance) "syn 1.0.109", ] @@ -612,7 +636,11 @@ checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" dependencies = [ "darling", "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", +======= + "quote 1.0.32", +>>>>>>> 94386bf (Build: Lock file maintenance) "syn 1.0.109", ] @@ -659,8 +687,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", "syn 2.0.26", +======= + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) ] [[package]] @@ -690,9 +723,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encoding_rs" @@ -738,12 +771,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "file-size" @@ -858,8 +888,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", "syn 2.0.26", +======= + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) ] [[package]] @@ -1194,17 +1229,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys", -] - [[package]] name = "ipnet" version = "2.8.0" @@ -1267,9 +1291,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "lock_api" @@ -1300,10 +1324,16 @@ dependencies = [ name = "lua_macros" version = "0.1.0" dependencies = [ +<<<<<<< HEAD "convert_case", "proc-macro2 1.0.66", "quote 1.0.31", "syn 2.0.26", +======= + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) ] [[package]] @@ -1570,9 +1600,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg 1.1.0", ] @@ -1614,7 +1644,7 @@ version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -1630,8 +1660,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", "syn 2.0.26", +======= + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) ] [[package]] @@ -1745,8 +1780,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", "syn 2.0.26", +======= + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) ] [[package]] @@ -1850,7 +1890,11 @@ dependencies = [ "anyhow", "itertools", "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", +======= + "quote 1.0.32", +>>>>>>> 94386bf (Build: Lock file maintenance) "syn 1.0.109", ] @@ -1865,9 +1909,15 @@ dependencies = [ [[package]] name = "quote" +<<<<<<< HEAD version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +======= +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +>>>>>>> 94386bf (Build: Lock file maintenance) dependencies = [ "proc-macro2 1.0.66", ] @@ -2064,7 +2114,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2073,7 +2123,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2143,6 +2193,33 @@ dependencies = [ ] [[package]] +<<<<<<< HEAD +======= +name = "rlua" +version = "0.19.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d33e5ba15c3d43178f283ed5863d4531e292fc0e56fb773f3bea45f18e3a42a" +dependencies = [ + "bitflags 1.3.2", + "bstr", + "libc", + "num-traits", + "rlua-lua54-sys", +] + +[[package]] +name = "rlua-lua54-sys" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aafabafe1895cb4a2be81a56d7ff3d46bf4b5d2f9cfdbea2ed404cdabe96474" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +>>>>>>> 94386bf (Build: Lock file maintenance) name = "ruma" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2199,7 +2276,7 @@ dependencies = [ "thiserror", "tracing", "url", - "uuid 1.4.0", + "uuid 1.4.1", "wildmatch", ] @@ -2234,7 +2311,11 @@ dependencies = [ "once_cell", "proc-macro-crate", "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", +======= + "quote 1.0.32", +>>>>>>> 94386bf (Build: Lock file maintenance) "ruma-identifiers-validation", "serde", "syn 1.0.109", @@ -2255,13 +2336,12 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.23" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ - "bitflags", + "bitflags 2.3.3", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys", @@ -2284,17 +2364,17 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2303,9 +2383,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -2313,9 +2393,15 @@ dependencies = [ [[package]] name = "serde" +<<<<<<< HEAD version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +======= +version = "1.0.175" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" +>>>>>>> 94386bf (Build: Lock file maintenance) dependencies = [ "serde_derive", ] @@ -2331,6 +2417,7 @@ dependencies = [ [[package]] name = "serde_derive" +<<<<<<< HEAD version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" @@ -2338,6 +2425,15 @@ dependencies = [ "proc-macro2 1.0.66", "quote 1.0.31", "syn 2.0.26", +======= +version = "1.0.175" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" +dependencies = [ + "proc-macro2 1.0.66", + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) ] [[package]] @@ -2389,9 +2485,15 @@ dependencies = [ [[package]] name = "signal-hook" +<<<<<<< HEAD version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b824b6e687aff278cdbf3b36f07aa52d4bd4099699324d5da86a2ebce3aa00b3" +======= +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +>>>>>>> 94386bf (Build: Lock file maintenance) dependencies = [ "libc", "signal-hook-registry", @@ -2503,28 +2605,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", +======= + "quote 1.0.32", +>>>>>>> 94386bf (Build: Lock file maintenance) "unicode-ident", ] [[package]] name = "syn" +<<<<<<< HEAD version = "2.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" dependencies = [ "proc-macro2 1.0.66", "quote 1.0.31", +======= +version = "2.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +dependencies = [ + "proc-macro2 1.0.66", + "quote 1.0.32", +>>>>>>> 94386bf (Build: Lock file maintenance) "unicode-ident", ] [[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" dependencies = [ - "autocfg 1.1.0", "cfg-if", "fastrand", "redox_syscall 0.3.5", @@ -2534,22 +2648,27 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", "syn 2.0.26", +======= + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) ] [[package]] @@ -2603,8 +2722,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", "syn 2.0.26", +======= + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) ] [[package]] @@ -2682,8 +2806,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", "syn 2.0.26", +======= + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) ] [[package]] @@ -2725,7 +2854,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cassowary", "crossterm", "unicode-segmentation", @@ -2828,9 +2957,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "getrandom 0.2.10", "wasm-bindgen", @@ -2922,8 +3051,13 @@ dependencies = [ "log", "once_cell", "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", "syn 2.0.26", +======= + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) "wasm-bindgen-shared", ] @@ -2945,7 +3079,11 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ +<<<<<<< HEAD "quote 1.0.31", +======= + "quote 1.0.32", +>>>>>>> 94386bf (Build: Lock file maintenance) "wasm-bindgen-macro-support", ] @@ -2956,8 +3094,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", "syn 2.0.26", +======= + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3142,6 +3285,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2 1.0.66", +<<<<<<< HEAD "quote 1.0.31", "syn 2.0.26", +======= + "quote 1.0.32", + "syn 2.0.27", +>>>>>>> 94386bf (Build: Lock file maintenance) ] diff --git a/flake.lock b/flake.lock index f952431..e6d94cf 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,19 @@ }, "nixpkgs": { "locked": { +<<<<<<< HEAD "lastModified": 1689449371, "narHash": "sha256-sK3Oi8uEFrFPL83wKPV6w0+96NrmwqIpw9YFffMifVg=", "owner": "NixOS", "repo": "nixpkgs", "rev": "29bcead8405cfe4c00085843eb372cc43837bb9d", +======= + "lastModified": 1690083312, + "narHash": "sha256-I3egwgNXavad1eIjWu1kYyi0u73di/sMmlnQIuzQASk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "af8cd5ded7735ca1df1a1174864daab75feeb64a", +>>>>>>> 94386bf (Build: Lock file maintenance) "type": "github" }, "original": { @@ -85,7 +93,9 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay", + "rustc_cranelift_backend": "rustc_cranelift_backend", + "rustc_cranelift_backend_src": "rustc_cranelift_backend_src" } }, "rust-overlay": { @@ -98,11 +108,19 @@ ] }, "locked": { +<<<<<<< HEAD "lastModified": 1689561325, "narHash": "sha256-+UABrHUXtWJSc9mM7oEKPIYQEhTzUVVNy2IPG9Lfrj0=", "owner": "oxalica", "repo": "rust-overlay", "rev": "d8a38aea13c67dc2ce10cff93eb274dcf455753f", +======= + "lastModified": 1690165277, + "narHash": "sha256-P3X8iSAu12z+UFxquuntZnR8sXjKwgYHf0wTzgO8I7M=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "317c523c09218f27f1da1ec0d06bbd2cbc0c1939", +>>>>>>> 94386bf (Build: Lock file maintenance) "type": "github" }, "original": { @@ -111,6 +129,35 @@ "type": "github" } }, + "rustc_cranelift_backend": { + "flake": false, + "locked": { + "lastModified": 1690205271, + "narHash": "sha256-mMj1dSlGzM+jCgtVX/KNxdYPXohS22RyU/uWmhR7EA0=", + "owner": "bjorn3", + "repo": "rustc_codegen_cranelift", + "rev": "6641b3a548a425eae518b675e43b986094daf609", + "type": "github" + }, + "original": { + "owner": "bjorn3", + "ref": "dev", + "repo": "rustc_codegen_cranelift", + "type": "github" + } + }, + "rustc_cranelift_backend_src": { + "flake": false, + "locked": { + "narHash": "sha256-E4n1Dqne8/9XHVKFqApdp2baxXun0DMl+oHfo4+oq3Q=", + "type": "tarball", + "url": "https://github.com/bjorn3/rustc_codegen_cranelift/releases/download/dev/cg_clif-x86_64-unknown-linux-gnu.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/bjorn3/rustc_codegen_cranelift/releases/download/dev/cg_clif-x86_64-unknown-linux-gnu.tar.xz" + } + }, "systems": { "locked": { "lastModified": 1681028828,