about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2024-03-10T20·59+0100
committerclbot <clbot@tvl.fyi>2024-03-17T10·56+0000
commite220d807270e9967d7b76070b968981c2c3dda0c (patch)
tree6f03daacaf111fbb76d0de248f922046dc513c49
parent32c56749623dea3f7076b3f4d7952e36449e4fde (diff)
chore(3p/sources): Bump channels & overlays r/7717
- agenix has not been updated (https://github.com/ryantm/agenix/pull/241).

- //tvix: regenerate protobuf files

- //tvix:clippy: work around https://github.com/rust-lang/rust-clippy/issues/12281
  which exclusively causes false positives in our code at the moment.

Change-Id: I38d2f4c0e6d1abc92be360b06f58e6d40e7732a3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11127
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
-rw-r--r--third_party/sources/sources.json30
-rw-r--r--tvix/build-go/build.pb.go2
-rw-r--r--tvix/build-go/rpc_build.pb.go2
-rw-r--r--tvix/castore-go/castore.pb.go2
-rw-r--r--tvix/castore-go/rpc_blobstore.pb.go2
-rw-r--r--tvix/castore-go/rpc_directory.pb.go2
-rw-r--r--tvix/default.nix4
-rw-r--r--tvix/store-go/pathinfo.pb.go2
-rw-r--r--tvix/store-go/rpc_pathinfo.pb.go2
9 files changed, 25 insertions, 23 deletions
diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json
index aa6a4e83b0..dc2fe79150 100644
--- a/third_party/sources/sources.json
+++ b/third_party/sources/sources.json
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "35b810dcbe9543e026f6a7095b955f7c9643b9b3",
-        "sha256": "1c29snz9fvhhgg8pxw5cgx90apsq5r3sdzmq8dfbqg6pizdjf57h",
+        "rev": "a230393bb7e2db667c63c3f5c279a6e26d8b1c5a",
+        "sha256": "0qirvr63w4q8ik356vhalsi14ln5145dfad3x05qh02xiwi8b057",
         "type": "tarball",
-        "url": "https://github.com/nix-community/emacs-overlay/archive/35b810dcbe9543e026f6a7095b955f7c9643b9b3.tar.gz",
+        "url": "https://github.com/nix-community/emacs-overlay/archive/a230393bb7e2db667c63c3f5c279a6e26d8b1c5a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "home-manager": {
@@ -29,10 +29,10 @@
         "homepage": "https://nix-community.github.io/home-manager/",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cf111d1a849ddfc38e9155be029519b0e2329615",
-        "sha256": "0f89x9r6s1i969acs9bxjbbf7wbllwjmkdszy66yh9b8h8kkhlzs",
+        "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a",
+        "sha256": "1i5az5dbjxslrk73j77xk7ww33kwdhhjw94ac25r704lzi2qs80n",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/cf111d1a849ddfc38e9155be029519b0e2329615.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/36f873dfc8e2b6b89936ff3e2b74803d50447e0a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "impermanence": {
@@ -77,10 +77,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
-        "sha256": "0mhh8wyfcncg1sjkpdy72afhi964h5i70vampc60pslaqd1s06pa",
+        "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
+        "sha256": "0v5q4zadnmdiv8hwcsx804l8radx562aqdw0r5nld127c8f7jzz8",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/9df3e30ce24fd28c7b3e2de0d986769db5d6225d.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/3030f185ba6a4bf4f18b87f345f104e6a6961f34.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-stable": {
@@ -89,10 +89,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "880992dcc006a5e00dd0591446fdf723e6a51a64",
-        "sha256": "1rsbjwbjgnrh0gm54w7nlshkkgp5718d5rk4x8kvklpfivlpfb5n",
+        "rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d",
+        "sha256": "1j5vs24bgy2arl342lrh3znc1pdz68kcjp2rpgy3sccpd9sibqqn",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/880992dcc006a5e00dd0591446fdf723e6a51a64.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/b94a96839afcc56de3551aa7472b8d9a3e77e05d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rust-overlay": {
@@ -101,10 +101,10 @@
         "homepage": "",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "7fdb7a7a846dc1f407cd6b24af04a0b8d018c3de",
-        "sha256": "0zaxb97fwjqhlvlmklxxwis07zvby640hrlxfc6hrbd6w6xjs59r",
+        "rev": "d09dac6a63a2ac4b74ac2ecdc19acd8c46c2da2c",
+        "sha256": "114jsacnmy62c6pz9249sbbvzx29cls2jli4rz3bzzydxn07hxd6",
         "type": "tarball",
-        "url": "https://github.com/oxalica/rust-overlay/archive/7fdb7a7a846dc1f407cd6b24af04a0b8d018c3de.tar.gz",
+        "url": "https://github.com/oxalica/rust-overlay/archive/d09dac6a63a2ac4b74ac2ecdc19acd8c46c2da2c.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rustsec-advisory-db": {
diff --git a/tvix/build-go/build.pb.go b/tvix/build-go/build.pb.go
index de0f11727f..9c6bd5f248 100644
--- a/tvix/build-go/build.pb.go
+++ b/tvix/build-go/build.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.32.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        (unknown)
 // source: tvix/build/protos/build.proto
 
diff --git a/tvix/build-go/rpc_build.pb.go b/tvix/build-go/rpc_build.pb.go
index 36de46b765..aae0cd9d47 100644
--- a/tvix/build-go/rpc_build.pb.go
+++ b/tvix/build-go/rpc_build.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.32.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        (unknown)
 // source: tvix/build/protos/rpc_build.proto
 
diff --git a/tvix/castore-go/castore.pb.go b/tvix/castore-go/castore.pb.go
index 26c23de1b0..464f1d4a41 100644
--- a/tvix/castore-go/castore.pb.go
+++ b/tvix/castore-go/castore.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.32.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        (unknown)
 // source: tvix/castore/protos/castore.proto
 
diff --git a/tvix/castore-go/rpc_blobstore.pb.go b/tvix/castore-go/rpc_blobstore.pb.go
index 71ccc1e0b1..3607a65bbe 100644
--- a/tvix/castore-go/rpc_blobstore.pb.go
+++ b/tvix/castore-go/rpc_blobstore.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.32.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        (unknown)
 // source: tvix/castore/protos/rpc_blobstore.proto
 
diff --git a/tvix/castore-go/rpc_directory.pb.go b/tvix/castore-go/rpc_directory.pb.go
index 2ee7180635..78c4a243e3 100644
--- a/tvix/castore-go/rpc_directory.pb.go
+++ b/tvix/castore-go/rpc_directory.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.32.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        (unknown)
 // source: tvix/castore/protos/rpc_directory.proto
 
diff --git a/tvix/default.nix b/tvix/default.nix
index e34e5e3164..da3e0ca605 100644
--- a/tvix/default.nix
+++ b/tvix/default.nix
@@ -220,7 +220,9 @@ in
       rustPlatform.cargoSetupHook
     ];
 
-    buildPhase = "cargo clippy --tests --all-features --benches --examples -- -Dwarnings | tee $out";
+    # Allow blocks_in_conditions due to false positives with #[tracing::instrument(…)]:
+    # https://github.com/rust-lang/rust-clippy/issues/12281
+    buildPhase = "cargo clippy --tests --all-features --benches --examples -- -Dwarnings -A clippy::blocks_in_conditions | tee $out";
   };
 
   meta.ci.targets = [
diff --git a/tvix/store-go/pathinfo.pb.go b/tvix/store-go/pathinfo.pb.go
index 23808765ba..a4915a3c1f 100644
--- a/tvix/store-go/pathinfo.pb.go
+++ b/tvix/store-go/pathinfo.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.32.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        (unknown)
 // source: tvix/store/protos/pathinfo.proto
 
diff --git a/tvix/store-go/rpc_pathinfo.pb.go b/tvix/store-go/rpc_pathinfo.pb.go
index 6b8355ff24..883ffb3f01 100644
--- a/tvix/store-go/rpc_pathinfo.pb.go
+++ b/tvix/store-go/rpc_pathinfo.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.32.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        (unknown)
 // source: tvix/store/protos/rpc_pathinfo.proto