update rust-toolchain: 2022-04-11 -> 2022-08-29, and update cargo deps

crates/spirv_backend_builder/Cargo.toml

@@ -8,17 +8,19 @@ edition = "2021"
 spirv-builder = { git = "https://github.com/EmbarkStudios/rust-gpu", features = ["use-compiled-tools"] }
 
 # these deps are to satisfy internal rustc stuff, since spirv-builder links into rustc internals (HACK).
+# this needs to match the rustc lock file -- not just its Cargo.toml -- so we pin down to the patch level
+# /nix/store/qpy4hy7i5qpb8xv4byxibls9av0lax4s-rust-default-1.65.0-nightly-2022-08-29/lib/rustlib/src/rust/Cargo.lock
+#
 # these are very likely to break during rustc updates, but they should be noisy.
 # just keep filling things in here based on rustc's Cargo.lock until it's satisfied.
-# this needs to match the rustc lock file -- not just its Cargo.toml -- so we pin down to the patch level
-# /nix/store/rlcla9529bwkd7a7ryrgfz97yyxaaxgd-rust-default-1.62.0-nightly-2022-04-11/lib/rustlib/src/rust/Cargo.lock
-cc = "=1.0.69"
+# then run `cargo update` inside `nix develop` to sync our own lock file, and `nix build` to test.
+cc = "=1.0.73"
 cfg-if = "=0.1.10"
-compiler_builtins = "=0.1.70"
+compiler_builtins = "=0.1.79"
 dlmalloc = "=0.2.3"
-fortanix-sgx-abi = "=0.3.3"
+fortanix-sgx-abi = "=0.5.0"
 getopts = "=0.2.21"
-hashbrown = "=0.12.0"
+hashbrown = "=0.12.3"
 hermit-abi = "=0.2.0"
-libc = "=0.2.121"
+libc = "=0.2.131"
 unicode-width = "=0.1.8"

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1656065134,
-        "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -17,11 +17,11 @@
     },
     "flake-utils_2": {
       "locked": {
-        "lastModified": 1656065134,
-        "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
         "type": "github"
       },
       "original": {
@@ -32,11 +32,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1656589841,
-        "narHash": "sha256-Kqd6r9aNIzjYGhMFYATdKwRbXBCGLcdqAJMLr4I8LG0=",
+        "lastModified": 1664029467,
+        "narHash": "sha256-ir7JbsLp2mqseCs3qI+Z/pkt+Gh+GfANbYcI5I+Gvnk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dbb62c34bbb5cdf05f1aeab07638b24b0824d605",
+        "rev": "893b6b9f6c4ed0c7efdb84bd300a499a2da9fa51",
         "type": "github"
       },
       "original": {
@@ -47,11 +47,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1656401090,
-        "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=",
+        "lastModified": 1659102345,
+        "narHash": "sha256-Vbzlz254EMZvn28BhpN8JOi5EuKqnHZ3ujFYgFcSGvk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "16de63fcc54e88b9a106a603038dd5dd2feb21eb",
+        "rev": "11b60e4f80d87794a2a4a8a256391b37c59a1ea7",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1656644123,
-        "narHash": "sha256-xg7D9aYBdmzH08MH6DlEOJW1UR5DYaQkvvvhnuXEatc=",
+        "lastModified": 1664074880,
+        "narHash": "sha256-/V1TX4HLADElvi3MuuIbNdvzR/HmNzbYRemKBjX/5YY=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "8b4c5bef319198920fd03a916dd5f6600147358b",
+        "rev": "45140fa526b1cb85498f717e355c79a54367cb1d",
         "type": "github"
       },
       "original": {

flake.nix

@@ -32,7 +32,8 @@
           cargoLock = {
             lockFile = ./Cargo.lock;
             outputHashes = {
-              "rustc_codegen_spirv-0.4.0-alpha.12" = "sha256-cZTUuyvNBuunK60r6vWVqqlovTXGpZZphBU8VP6tjsU=";
+              # required for `nix build` to work... i guess
+              "rustc_codegen_spirv-0.4.0-alpha.15" = "sha256-waEOWZtj+Kr7pY0R54PQqJWA41TauPjUwI5KcY4GVow=";
             };
           };
           # sim::spirv rgpu tests fail because we don't link vulkan-loader into the test runner.

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2022-04-11"
+channel = "nightly-2022-08-29"
 components = [ "rust-src", "rustc-dev", "llvm-tools-preview" ]
 targets = [ "x86_64-unknown-linux-gnu" ]
 profile = "default"