Compare commits

..

2 Commits

3 changed files with 186 additions and 13 deletions

170
Cargo.lock generated
View File

@ -139,8 +139,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
"syn 2.0.26",
=======
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
] ]
[[package]] [[package]]
@ -150,8 +155,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
"syn 2.0.26",
=======
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
] ]
[[package]] [[package]]
@ -442,9 +452,9 @@ dependencies = [
[[package]] [[package]]
name = "core-foundation-sys" name = "core-foundation-sys"
version = "0.8.4" version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" checksum = "a385f5d34e5eff161df2369056a3fd194fcabd8a64ce0eed02de09fcb3203434"
[[package]] [[package]]
name = "cpufeatures" name = "cpufeatures"
@ -563,7 +573,11 @@ dependencies = [
"fnv", "fnv",
"ident_case", "ident_case",
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
=======
"quote 1.0.32", "quote 1.0.32",
>>>>>>> 94386bf (Build: Lock file maintenance)
"strsim", "strsim",
"syn 1.0.109", "syn 1.0.109",
] ]
@ -575,7 +589,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
dependencies = [ dependencies = [
"darling_core", "darling_core",
<<<<<<< HEAD
"quote 1.0.31",
=======
"quote 1.0.32", "quote 1.0.32",
>>>>>>> 94386bf (Build: Lock file maintenance)
"syn 1.0.109", "syn 1.0.109",
] ]
@ -618,7 +636,11 @@ checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
=======
"quote 1.0.32", "quote 1.0.32",
>>>>>>> 94386bf (Build: Lock file maintenance)
"syn 1.0.109", "syn 1.0.109",
] ]
@ -665,8 +687,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
"syn 2.0.26",
=======
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
] ]
[[package]] [[package]]
@ -861,8 +888,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
"syn 2.0.26",
=======
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
] ]
[[package]] [[package]]
@ -1292,10 +1324,16 @@ dependencies = [
name = "lua_macros" name = "lua_macros"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
<<<<<<< HEAD
"convert_case", "convert_case",
"proc-macro2 1.0.66",
"quote 1.0.31",
"syn 2.0.26",
=======
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
] ]
[[package]] [[package]]
@ -1622,8 +1660,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
"syn 2.0.26",
=======
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
] ]
[[package]] [[package]]
@ -1737,8 +1780,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
"syn 2.0.26",
=======
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
] ]
[[package]] [[package]]
@ -1842,7 +1890,11 @@ dependencies = [
"anyhow", "anyhow",
"itertools", "itertools",
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
=======
"quote 1.0.32", "quote 1.0.32",
>>>>>>> 94386bf (Build: Lock file maintenance)
"syn 1.0.109", "syn 1.0.109",
] ]
@ -1857,9 +1909,15 @@ dependencies = [
[[package]] [[package]]
name = "quote" name = "quote"
<<<<<<< HEAD
version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0"
=======
version = "1.0.32" version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
>>>>>>> 94386bf (Build: Lock file maintenance)
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
] ]
@ -2135,6 +2193,33 @@ dependencies = [
] ]
[[package]] [[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" name = "ruma"
version = "0.7.4" version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
@ -2226,7 +2311,11 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro-crate", "proc-macro-crate",
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
=======
"quote 1.0.32", "quote 1.0.32",
>>>>>>> 94386bf (Build: Lock file maintenance)
"ruma-identifiers-validation", "ruma-identifiers-validation",
"serde", "serde",
"syn 1.0.109", "syn 1.0.109",
@ -2304,9 +2393,15 @@ dependencies = [
[[package]] [[package]]
name = "serde" name = "serde"
<<<<<<< HEAD
version = "1.0.171"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
=======
version = "1.0.175" version = "1.0.175"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b"
>>>>>>> 94386bf (Build: Lock file maintenance)
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
@ -2322,6 +2417,15 @@ dependencies = [
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
<<<<<<< HEAD
version = "1.0.171"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
dependencies = [
"proc-macro2 1.0.66",
"quote 1.0.31",
"syn 2.0.26",
=======
version = "1.0.175" version = "1.0.175"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4"
@ -2329,13 +2433,14 @@ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
] ]
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.104" version = "1.0.103"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
dependencies = [ dependencies = [
"itoa", "itoa",
"ryu", "ryu",
@ -2380,9 +2485,15 @@ dependencies = [
[[package]] [[package]]
name = "signal-hook" name = "signal-hook"
<<<<<<< HEAD
version = "0.3.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b824b6e687aff278cdbf3b36f07aa52d4bd4099699324d5da86a2ebce3aa00b3"
=======
version = "0.3.17" version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
>>>>>>> 94386bf (Build: Lock file maintenance)
dependencies = [ dependencies = [
"libc", "libc",
"signal-hook-registry", "signal-hook-registry",
@ -2494,18 +2605,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
=======
"quote 1.0.32", "quote 1.0.32",
>>>>>>> 94386bf (Build: Lock file maintenance)
"unicode-ident", "unicode-ident",
] ]
[[package]] [[package]]
name = "syn" 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" version = "2.0.27"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
"quote 1.0.32", "quote 1.0.32",
>>>>>>> 94386bf (Build: Lock file maintenance)
"unicode-ident", "unicode-ident",
] ]
@ -2538,8 +2662,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
"syn 2.0.26",
=======
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
] ]
[[package]] [[package]]
@ -2593,8 +2722,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
"syn 2.0.26",
=======
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
] ]
[[package]] [[package]]
@ -2672,8 +2806,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
"syn 2.0.26",
=======
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
] ]
[[package]] [[package]]
@ -2912,8 +3051,13 @@ dependencies = [
"log", "log",
"once_cell", "once_cell",
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
"syn 2.0.26",
=======
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -2935,7 +3079,11 @@ version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
dependencies = [ dependencies = [
<<<<<<< HEAD
"quote 1.0.31",
=======
"quote 1.0.32", "quote 1.0.32",
>>>>>>> 94386bf (Build: Lock file maintenance)
"wasm-bindgen-macro-support", "wasm-bindgen-macro-support",
] ]
@ -2946,8 +3094,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
"syn 2.0.26",
=======
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -3088,9 +3241,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]] [[package]]
name = "winnow" name = "winnow"
version = "0.5.1" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@ -3132,6 +3285,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [ dependencies = [
"proc-macro2 1.0.66", "proc-macro2 1.0.66",
<<<<<<< HEAD
"quote 1.0.31",
"syn 2.0.26",
=======
"quote 1.0.32", "quote 1.0.32",
"syn 2.0.27", "syn 2.0.27",
>>>>>>> 94386bf (Build: Lock file maintenance)
] ]

View File

@ -65,11 +65,19 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1690327932, <<<<<<< HEAD
"narHash": "sha256-Fv7PYZxN4eo0K6zXhHG/vOc+e2iuqQ5ywDrh0yeRjP0=", "lastModified": 1689449371,
"narHash": "sha256-sK3Oi8uEFrFPL83wKPV6w0+96NrmwqIpw9YFffMifVg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a9b47d85504bdd199e90846622c76aa0bfeabfac", "rev": "29bcead8405cfe4c00085843eb372cc43837bb9d",
=======
"lastModified": 1690083312,
"narHash": "sha256-I3egwgNXavad1eIjWu1kYyi0u73di/sMmlnQIuzQASk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "af8cd5ded7735ca1df1a1174864daab75feeb64a",
>>>>>>> 94386bf (Build: Lock file maintenance)
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -100,11 +108,19 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1690338181, <<<<<<< HEAD
"narHash": "sha256-Sz2oQ9aNS3MVncnCMndr0302G26UrFUfPynoH2iLjsg=", "lastModified": 1689561325,
"narHash": "sha256-+UABrHUXtWJSc9mM7oEKPIYQEhTzUVVNy2IPG9Lfrj0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "b7f0b7b58b3c6f14a1377ec31a3d78b23ab843ec", "rev": "d8a38aea13c67dc2ce10cff93eb274dcf455753f",
=======
"lastModified": 1690165277,
"narHash": "sha256-P3X8iSAu12z+UFxquuntZnR8sXjKwgYHf0wTzgO8I7M=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "317c523c09218f27f1da1ec0d06bbd2cbc0c1939",
>>>>>>> 94386bf (Build: Lock file maintenance)
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -151,7 +151,6 @@
]; ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
openssl openssl
lua54Packages.lua
]; ];
craneBuild = craneLib.buildPackage { craneBuild = craneLib.buildPackage {