Build(flake): Remove dead code from cranelift build process

Build: Lock file maintenance
2023-07-26 21:53:44 +02:00 · 2023-07-26 21:52:26 +02:00
3 changed files with 13 additions and 186 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -139,13 +139,8 @@ 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]]
@ -155,13 +150,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 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]]
@ -452,9 +442,9 @@ dependencies = [

 [[package]]
 name = "core-foundation-sys"
-version = "0.8.5"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a385f5d34e5eff161df2369056a3fd194fcabd8a64ce0eed02de09fcb3203434"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"

 [[package]]
 name = "cpufeatures"
@ -573,11 +563,7 @@ 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",
 ]
@ -589,11 +575,7 @@ 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",
 ]

@ -636,11 +618,7 @@ 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",
 ]

@ -687,13 +665,8 @@ 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]]
@ -888,13 +861,8 @@ 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]]
@ -1324,16 +1292,10 @@ 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]]
@ -1660,13 +1622,8 @@ 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]]
@ -1780,13 +1737,8 @@ 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]]
@ -1890,11 +1842,7 @@ 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",
 ]

@ -1909,15 +1857,9 @@ 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",
 ]
@ -2193,33 +2135,6 @@ 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"
@ -2311,11 +2226,7 @@ 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",
@ -2393,15 +2304,9 @@ 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",
 ]
@ -2417,15 +2322,6 @@ dependencies = [

 [[package]]
 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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4"
@ -2433,14 +2329,13 @@ dependencies = [
 "proc-macro2 1.0.66",
 "quote 1.0.32",
 "syn 2.0.27",
->>>>>>> 94386bf (Build: Lock file maintenance)
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
 dependencies = [
 "itoa",
 "ryu",
@ -2485,15 +2380,9 @@ 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",
@ -2605,31 +2494,18 @@ 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",
 ]

@ -2662,13 +2538,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 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]]
@ -2722,13 +2593,8 @@ 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]]
@ -2806,13 +2672,8 @@ 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]]
@ -3051,13 +2912,8 @@ 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",
 ]

@ -3079,11 +2935,7 @@ 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",
 ]

@ -3094,13 +2946,8 @@ 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",
 ]
@ -3241,9 +3088,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"

 [[package]]
 name = "winnow"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7"
+checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11"
 dependencies = [
 "memchr",
 ]
@ -3285,11 +3132,6 @@ 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)
 ]
--- a/flake.lock
+++ b/flake.lock
@ -65,19 +65,11 @@
    },
    "nixpkgs": {
      "locked": {
-<<<<<<< HEAD
-        "lastModified": 1689449371,
-        "narHash": "sha256-sK3Oi8uEFrFPL83wKPV6w0+96NrmwqIpw9YFffMifVg=",
+        "lastModified": 1690327932,
+        "narHash": "sha256-Fv7PYZxN4eo0K6zXhHG/vOc+e2iuqQ5ywDrh0yeRjP0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "29bcead8405cfe4c00085843eb372cc43837bb9d",
-=======
-        "lastModified": 1690083312,
-        "narHash": "sha256-I3egwgNXavad1eIjWu1kYyi0u73di/sMmlnQIuzQASk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "af8cd5ded7735ca1df1a1174864daab75feeb64a",
->>>>>>> 94386bf (Build: Lock file maintenance)
+        "rev": "a9b47d85504bdd199e90846622c76aa0bfeabfac",
        "type": "github"
      },
      "original": {
@ -108,19 +100,11 @@
        ]
      },
      "locked": {
-<<<<<<< HEAD
-        "lastModified": 1689561325,
-        "narHash": "sha256-+UABrHUXtWJSc9mM7oEKPIYQEhTzUVVNy2IPG9Lfrj0=",
+        "lastModified": 1690338181,
+        "narHash": "sha256-Sz2oQ9aNS3MVncnCMndr0302G26UrFUfPynoH2iLjsg=",
        "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)
+        "rev": "b7f0b7b58b3c6f14a1377ec31a3d78b23ab843ec",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -151,6 +151,7 @@
        ];
        buildInputs = with pkgs; [
          openssl
+          lua54Packages.lua
        ];

        craneBuild = craneLib.buildPackage {
Author	SHA1	Message	Date
Benedikt Peetz	3d417d7e15	Build(flake): Remove dead code from cranelift build process	2023-07-26 21:53:44 +02:00
Benedikt Peetz	5e7ed3d084	Build: Lock file maintenance	2023-07-26 21:52:26 +02:00