build(flake): Switch to nixpkgs's wrapped mold linker

By now a wrapped version of mold exists, which thus works with the NixOS libraries. This is obviously the same as my self-wrapped version, but vendoring is just not important here.
build(flake): Remove language-servers from the devshell
2023-10-31 18:55:18 +01:00 · 2023-10-31 18:50:46 +01:00 · 2023-10-31 18:50:05 +01:00 · 2023-10-31 18:47:01 +01:00 · 2023-10-31 18:04:18 +01:00
4 changed files with 92 additions and 255 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -40,9 +40,9 @@ dependencies = [

 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
 dependencies = [
 "getrandom 0.2.10",
 "once_cell",
@ -251,9 +251,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"

 [[package]]
 name = "base64"
-version = "0.21.4"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"

 [[package]]
 name = "base64ct"
@ -431,9 +431,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.4.6"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
+checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
 dependencies = [
 "clap_builder",
 "clap_derive",
@ -441,9 +441,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.4.6"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
+checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
 dependencies = [
 "anstream",
 "anstyle",
@ -453,9 +453,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.4.2"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
 dependencies = [
 "heck",
 "proc-macro2",
@ -465,9 +465,9 @@ dependencies = [

 [[package]]
 name = "clap_lex"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"

 [[package]]
 name = "cli-log"
@ -526,9 +526,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"

 [[package]]
 name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
 dependencies = [
 "libc",
 ]
@ -664,7 +664,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
 "cfg-if",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
 "lock_api",
 "once_cell",
 "parking_lot_core 0.9.9",
@ -905,9 +905,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"

 [[package]]
 name = "futures"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -920,9 +920,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
 dependencies = [
 "futures-core",
 "futures-sink",
@ -930,15 +930,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"

 [[package]]
 name = "futures-executor"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
 dependencies = [
 "futures-core",
 "futures-task",
@ -947,15 +947,15 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"

 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
 dependencies = [
 "proc-macro2",
 "quote",
@ -978,21 +978,21 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"

 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"

 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -1099,9 +1099,9 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"

 [[package]]
 name = "heck"
@ -1184,7 +1184,7 @@ dependencies = [
 "httpdate",
 "itoa",
 "pin-project-lite",
- "socket2 0.4.9",
+ "socket2 0.4.10",
 "tokio",
 "tower-service",
 "tracing",
@ -1275,7 +1275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
 dependencies = [
 "equivalent",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
 ]

 [[package]]
@ -1302,9 +1302,9 @@ dependencies = [

 [[package]]
 name = "ipnet"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"

 [[package]]
 name = "itertools"
@ -1618,9 +1618,9 @@ dependencies = [

 [[package]]
 name = "mio"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
 dependencies = [
 "libc",
 "log",
@ -2065,15 +2065,6 @@ dependencies = [
 "bitflags 1.3.2",
 ]

-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@ -2129,7 +2120,7 @@ version = "0.11.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
 dependencies = [
- "base64 0.21.4",
+ "base64 0.21.5",
 "bytes",
 "encoding_rs",
 "futures-core",
@ -2274,9 +2265,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"

 [[package]]
 name = "rustix"
-version = "0.38.19"
+version = "0.38.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
+checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
 dependencies = [
 "bitflags 2.4.1",
 "errno",
@ -2331,9 +2322,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.189"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
 dependencies = [
 "serde_derive",
 ]
@ -2359,9 +2350,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.189"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2370,9 +2361,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
 "itoa",
 "ryu",
@ -2484,9 +2475,9 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"

 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
 dependencies = [
 "libc",
 "winapi",
@ -2494,9 +2485,9 @@ dependencies = [

 [[package]]
 name = "socket2"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
 "libc",
 "windows-sys",
@ -2568,31 +2559,31 @@ dependencies = [

 [[package]]
 name = "tempfile"
-version = "3.8.0"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
 dependencies = [
 "cfg-if",
 "fastrand",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.4.1",
 "rustix",
 "windows-sys",
 ]

 [[package]]
 name = "thiserror"
-version = "1.0.49"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.49"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2626,7 +2617,7 @@ dependencies = [
 "mio",
 "num_cpus",
 "pin-project-lite",
- "socket2 0.5.4",
+ "socket2 0.5.5",
 "tokio-macros",
 "windows-sys",
 ]
@ -2654,9 +2645,9 @@ dependencies = [

 [[package]]
 name = "tokio-util"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
 dependencies = [
 "bytes",
 "futures-core",
@ -2677,9 +2668,9 @@ dependencies = [

 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"

 [[package]]
 name = "toml_edit"
@ -2700,9 +2691,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"

 [[package]]
 name = "tracing"
-version = "0.1.39"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
 "pin-project-lite",
 "tracing-attributes",
@ -2772,12 +2763,13 @@ dependencies = [

 [[package]]
 name = "tui-textarea"
-version = "0.2.2"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ddd5d2aea3541baccf9c298ecace702201e0fbf348e80bd8811acb4f62b5952"
+checksum = "78ae7c920c9e7d428f8d0d1a7e371833deb932b358f588afceac6c58d34cef5f"
 dependencies = [
 "crossterm",
 "tui",
+ "unicode-width",
 ]

 [[package]]
@ -3121,9 +3113,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"

 [[package]]
 name = "winnow"
-version = "0.5.17"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
+checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32"
 dependencies = [
 "memchr",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@ -11,7 +11,7 @@ default = ["tui"]
 tui = ["dep:tui", "dep:tui-textarea", "dep:crossterm", "dep:tokio-util", "dep:serde", "dep:indexmap"]

 [dependencies]
-clap = { version = "4.4.6", features = ["derive"] }
+clap = { version = "4.4.7", features = ["derive"] }
 cli-log = "2.0"
 anyhow = "1.0"
 matrix-sdk = "0.6"
--- a/flake.lock
+++ b/flake.lock
@ -2,25 +2,16 @@
  "nodes": {
    "crane": {
      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "flake-utils"
-        ],
        "nixpkgs": [
          "nixpkgs"
-        ],
-        "rust-overlay": [
-          "rust-overlay"
        ]
      },
      "locked": {
-        "lastModified": 1697648018,
-        "narHash": "sha256-C7hHmozOpuG4G6/NAnd0/EE1osAzgIV+6eZbuRYtf5U=",
+        "lastModified": 1698166613,
+        "narHash": "sha256-y4rdN4flxRiROqNi1waMYIZj/Fs7L2OrszFk/1ry9vU=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "bd2e69ee84552b2befe2594060513ea9e01bfeea",
+        "rev": "b7db46f0f1751f7b1d1911f6be7daf568ad5bc65",
        "type": "github"
      },
      "original": {
@ -65,11 +56,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1697379843,
-        "narHash": "sha256-RcnGuJgC2K/UpTy+d32piEoBXq2M+nVFzM3ah/ZdJzg=",
+        "lastModified": 1698553279,
+        "narHash": "sha256-T/9P8yBSLcqo/v+FTOBK+0rjzjPMctVymZydbvR/Fak=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "12bdeb01ff9e2d3917e6a44037ed7df6e6c3df9d",
+        "rev": "90e85bc7c1a6fc0760a94ace129d3a1c61c3d035",
        "type": "github"
      },
      "original": {
@ -85,9 +76,7 @@
        "flake-compat": "flake-compat",
        "flake-utils": "flake-utils",
        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay",
-        "rustc_cranelift_backend": "rustc_cranelift_backend",
-        "rustc_cranelift_backend_src": "rustc_cranelift_backend_src"
+        "rust-overlay": "rust-overlay"
      }
    },
    "rust-overlay": {
@ -100,11 +89,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1697595136,
-        "narHash": "sha256-9honwiIeMbBKi7FzfEy89f1ShUiXz/gVxZSS048pKyc=",
+        "lastModified": 1698726852,
+        "narHash": "sha256-V1S4TTzg++GzPc96i/yy4jib+7/xU0LXHcggm9MllMM=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "a2ccfb2134622b28668a274e403ba6f075ae1223",
+        "rev": "ec19bd20af08f3b004089cc12ab54c823ed899b7",
        "type": "github"
      },
      "original": {
@ -113,35 +102,6 @@
        "type": "github"
      }
    },
-    "rustc_cranelift_backend": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1697371505,
-        "narHash": "sha256-5j+psQPh1UB/eDG7qDE1azYhSdFN1F21Usnl3jZroQI=",
-        "owner": "bjorn3",
-        "repo": "rustc_codegen_cranelift",
-        "rev": "ba0f7e35346b24ceca630889873a1dccc28f8ae9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "bjorn3",
-        "ref": "dev",
-        "repo": "rustc_codegen_cranelift",
-        "type": "github"
-      }
-    },
-    "rustc_cranelift_backend_src": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-PWxiQDKsObZn5YgFbPepKN8HXYplYD6GzxiauFKuCyk=",
-        "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,
--- a/flake.nix
+++ b/flake.nix
@ -13,9 +13,6 @@
      url = "github:ipetkov/crane";
      inputs = {
        nixpkgs.follows = "nixpkgs";
-        flake-compat.follows = "flake-compat";
-        flake-utils.follows = "flake-utils";
-        rust-overlay.follows = "rust-overlay";
      };
    };
    flake-utils = {
@ -29,16 +26,6 @@
        flake-utils.follows = "flake-utils";
      };
    };
-
-    # cranelift
-    rustc_cranelift_backend = {
-      url = "github:bjorn3/rustc_codegen_cranelift/dev";
-      flake = false;
-    };
-    rustc_cranelift_backend_src = {
-      url = "https://github.com/bjorn3/rustc_codegen_cranelift/releases/download/dev/cg_clif-x86_64-unknown-linux-gnu.tar.xz";
-      flake = false;
-    };
  };

  outputs = {
@ -47,129 +34,30 @@
    crane,
    flake-utils,
    rust-overlay,
-    rustc_cranelift_backend,
-    rustc_cranelift_backend_src,
    ...
  }:
    flake-utils.lib.eachDefaultSystem (system: let
-      inherit (pkgs) lib;
-      bintools-wrapper = "${nixpkgs}/pkgs/build-support/bintools-wrapper";
-      mold' = pkgs.symlinkJoin {
-        name = "mold";
-        paths = [pkgs.mold];
-        nativeBuildInputs = [pkgs.makeWrapper];
-        suffixSalt = lib.replaceStrings ["-" "."] ["_" "_"] pkgs.targetPlatform.config;
-        postBuild = ''
-          for bin in ${pkgs.mold}/bin/*; do
-            rm $out/bin/"$(basename "$bin")"
-
-            export prog="$bin"
-            substituteAll "${bintools-wrapper}/ld-wrapper.sh" $out/bin/"$(basename "$bin")"
-            chmod +x $out/bin/"$(basename "$bin")"
-
-            mkdir -p $out/nix-support
-            substituteAll "${bintools-wrapper}/add-flags.sh" $out/nix-support/add-flags.sh
-            substituteAll "${bintools-wrapper}/add-hardening.sh" $out/nix-support/add-hardening.sh
-            substituteAll "${bintools-wrapper}/../wrapper-common/utils.bash" $out/nix-support/utils.bash
-          done
-        '';
-      };
-      c_rust = pkgs.rust-bin.fromRustupToolchainFile "${rustc_cranelift_backend}/rust-toolchain";
-      rcb = pkgs.stdenv.mkDerivation {
-        pname = "rustc_cranelift_backend";
-        version = "1.0";
-        buildInputs = [c_rust];
-        nativeBuildInputs = with pkgs; [gawk fd];
-        srcs = ["${rustc_cranelift_backend_src}" "${c_rust}"];
-        sourceRoot = ".";
-        postUnpack = ''
-          rust_dir="$(fd . --max-depth 1 | awk '!/source/ && !/env-vars/')"
-
-          # remove unneeded stuff
-          rm -r "$rust_dir"/{bin,nix-support,share};
-          rm -r "$rust_dir"/lib/rustlib/{etc,src,rustc-src};
-
-          cp -r "$rust_dir"/. source/extra_dependencies
-          rm -r "$rust_dir"
-          cd source
-        '';
-        postPatch = ''
-          # patch bins
-          for file in $(fd . --type file);do
-              file="$(file --mime "$file" | awk 'BEGIN{FS=":"}/application\/x-pie-executable/{print $1}')";
-              if [ "$file" ]; then
-                  echo "file: '$file' matches";
-                  correct_interpreter_path="$(ldd "$file" | tail -n1 | awk 'BEGIN{FS="=> "} {print $2}' | awk 'BEGIN{FS=" "}{print $1}')"
-                  echo "correct interpreter path is: '$correct_interpreter_path'"
-                  patchelf --set-interpreter "$correct_interpreter_path" "$file"
-
-                  if [ "$(patchelf --print-interpreter "$file")" = "$correct_interpreter_path" ];then
-                    echo "Set interpreter";
-                  else
-                    echo "Failed to set interprter, the interpreter still is $(patchelf --print-interpreter )";
-                    exit 1
-                  fi
-              fi
-          done
-
-          # patch libs
-          all_files=$(mktemp);
-          for file in $(fd .);do
-              canonical_path="$(readlink -f "$file")"
-              file="$(file --mime "$canonical_path" | awk 'BEGIN{FS=":"}/application\/x-sharedlib/{print $1}')";
-              if [ "$file" ]; then
-                  echo "$file" >> $all_files;
-              fi
-          done
-          while read -r file; do
-              echo "___________________";
-              echo "Checking file: '$file'";
-              is_missing="$(ldd "$file" | awk 'BEGIN{FS="=>"}{if (/not found/){print $1}}')"
-              if [ "$is_missing" ];then
-                  echo "Warning: The following things are missing:";
-                  for line in $is_missing; do
-                      echo "  $line";
-                  done
-                  echo
-                  for line in $is_missing; do
-                      echo "Searching for a substitute for '$line'"
-                      substitute="$(grep "$line" "$all_files" | awk 'BEGIN{FS=" "}{print $1}' | tail -n1)";
-                      if [ "$substitute" ]; then
-                          echo "Found '$substitute', which can substitute '$line'"
-                          echo "Patching.."
-                          patchelf --replace-needed "$line" "$(readlink -f "$substitute")" "$file";
-                      else
-                          echo "Error: Failed to find a substitute"
-                      fi
-                  done
-              else
-                  echo "This file is not missing anything"
-              fi
-          done < $all_files
-          rm $all_files
-        '';
-        installPhase = ''
-          install -d $out/
-          cp -r ./. $out/
-        '';
-      };
      pkgs = import nixpkgs {
        inherit system;
        overlays = [(import rust-overlay)];
      };

-      nightly = false;
+      nightly = true;
      rust =
        if nightly
-        then pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default)
+        then
+          (pkgs.rust-bin.selectLatestNightlyWith (toolchain:
+              toolchain.default))
+          .override {
+            extensions = ["rustc-codegen-cranelift-preview"];
+          }
        else pkgs.rust-bin.stable.latest.default;

      craneLib = (crane.mkLib pkgs).overrideToolchain rust;

      nativeBuildInputs = with pkgs; [
        pkg-config
-        mold'
-        rcb
+        mold-wrapped
      ];
      buildInputs = with pkgs; [
        openssl
@ -194,10 +82,7 @@

      devShells.default = pkgs.mkShell {
        packages = with pkgs; [
-          nil
          alejandra
-          statix
-          ltex-ls

          rust
          rust-analyzer
Author	SHA1	Message	Date
Benedikt Peetz	196c392f59	build(flake): Switch to nixpkgs's wrapped mold linker By now a wrapped version of mold exists, which thus works with the NixOS libraries. This is obviously the same as my self-wrapped version, but vendoring is just not important here.	2023-10-31 18:55:18 +01:00
Benedikt Peetz	66e3b362c3	build(flake): Remove language-servers from the devshell These should always be provided by the editor, and not the devshell.	2023-10-31 18:50:46 +01:00
Benedikt Peetz	8413a30090	build(flake): Remove unused crane overrides	2023-10-31 18:50:05 +01:00
Benedikt Peetz	df07c3fc24	build(flake): Replace self-packaged cranelift with rustup's Motivation ========== The self-packed one sort-of worked, but was rather flaky, while the one from rustup obviously works, as it's an officially distributed part. Running it ========== Instead of the `cargo clif [build, etc.]` you now need to run (on nightly): ``` RUSTFLAGS="-Zcodegen-backend=cranelift" cargo build ``` Performance =========== On my system I noticed, that a debug build takes around 20 sec more with cranelift, compared to the default LLVM backend. One possible hypothesis, for that could be, that cranelift does not link via `mold` but instead still uses GNU's `gold`. On the other hand, the performance decrease could also be caused by the fact, that it's an early preview and some optimizations are still lacking.	2023-10-31 18:47:01 +01:00
Benedikt Peetz	c1b426d590	build(treewide): Update	2023-10-31 18:04:18 +01:00