chore(3p/sources): Bump channels & overlays r/7422

- Adjust to ecl 23.9.9 release

- Regenerate go protos after protoc-gen-go update

- Drop dhall fork which hasn't kept up with 1.42.*

- Address new clippy warnings:

  - Variant naming of Error::ValidationError
  - Simplify .try_into().unwrap()
  - Drop unnecessary identity function
  - Test module must be last in file
  - Drop unused `pub use`

- Update agenix to 0.15.0. Current master has a installCheckPhase that
  doesn't work with C++ Nix 2.3.*:
  https://github.com/ryantm/agenix/commit/a23aa271bec82d3e962bafb994595c1c4a62b133#commitcomment-137185861

Change-Id: Ic29eef20d6fd1362ce1031364a5ca6b4edf195bd
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10615
Reviewed-by: aspen <root@gws.fyi>
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>

13 files changed, 42 insertions, 50 deletions

diff --git a/tvix/build-go/build.pb.go b/tvix/build-go/build.pb.go
index 6646d4e91f..de0f11727f 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.31.0
+// 	protoc-gen-go v1.32.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 4bde10b219..36de46b765 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.31.0
+// 	protoc-gen-go v1.32.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 ab39f1fda1..26c23de1b0 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.31.0
+// 	protoc-gen-go v1.32.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 73bcb91ba9..71ccc1e0b1 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.31.0
+// 	protoc-gen-go v1.32.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 d65d646e71..2ee7180635 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.31.0
+// 	protoc-gen-go v1.32.0
 // 	protoc        (unknown)
 // source: tvix/castore/protos/rpc_directory.proto
 
diff --git a/tvix/castore/src/proto/tests/directory.rs b/tvix/castore/src/proto/tests/directory.rs
index a5e4f3c9c1..5fda394775 100644
--- a/tvix/castore/src/proto/tests/directory.rs
+++ b/tvix/castore/src/proto/tests/directory.rs
@@ -141,9 +141,7 @@ fn digest() {
 
     assert_eq!(
         d.digest(),
-        (&hex!("af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262"))
-            .try_into()
-            .unwrap()
+        (&hex!("af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")).into()
     )
 }
 
diff --git a/tvix/eval/src/value/attrs/tests.rs b/tvix/eval/src/value/attrs/tests.rs
index 473592c519..5c693873cd 100644
--- a/tvix/eval/src/value/attrs/tests.rs
+++ b/tvix/eval/src/value/attrs/tests.rs
@@ -78,11 +78,7 @@ fn test_kv_attrs_iter() {
     )
     .expect("constructing K/V pair attrs should succeed");
 
-    let mut iter = kv_attrs
-        .iter()
-        .collect::<Vec<_>>()
-        .into_iter()
-        .map(|(k, v)| (k, v));
+    let mut iter = kv_attrs.iter().collect::<Vec<_>>().into_iter();
     let (k, v) = iter.next().unwrap();
     assert!(k == *NAME_REF);
     assert!(v.to_str().unwrap() == meaning_val.to_str().unwrap());
diff --git a/tvix/glue/src/builtins/derivation.rs b/tvix/glue/src/builtins/derivation.rs
index 180567b8c4..227b703f36 100644
--- a/tvix/glue/src/builtins/derivation.rs
+++ b/tvix/glue/src/builtins/derivation.rs
@@ -526,5 +526,3 @@ pub(crate) mod derivation_builtins {
         Ok(Value::String(NixString::new_context_from(context, &path)))
     }
 }
-
-pub use derivation_builtins::builtins as derivation_builtins;
diff --git a/tvix/nix-compat/src/derivation/parser.rs b/tvix/nix-compat/src/derivation/parser.rs
index f54852cb22..7ffa6fd46e 100644
--- a/tvix/nix-compat/src/derivation/parser.rs
+++ b/tvix/nix-compat/src/derivation/parser.rs
@@ -23,7 +23,7 @@ pub enum Error<I> {
     #[error("premature EOF")]
     Incomplete,
     #[error("validation error: {0}")]
-    ValidationError(super::DerivationError),
+    Validation(super::DerivationError),
 }
 
 pub(crate) fn parse(i: &[u8]) -> Result<Derivation, Error<&[u8]>> {
@@ -33,7 +33,7 @@ pub(crate) fn parse(i: &[u8]) -> Result<Derivation, Error<&[u8]>> {
             debug_assert!(rest.is_empty());
 
             // invoke validate
-            derivation.validate(true).map_err(Error::ValidationError)?;
+            derivation.validate(true).map_err(Error::Validation)?;
 
             Ok(derivation)
         }
diff --git a/tvix/nix-compat/src/nar/wire/tag.rs b/tvix/nix-compat/src/nar/wire/tag.rs
index 55ce4b4a2a..55b93f9985 100644
--- a/tvix/nix-compat/src/nar/wire/tag.rs
+++ b/tvix/nix-compat/src/nar/wire/tag.rs
@@ -91,36 +91,6 @@ macro_rules! make {
     };
 }
 
-pub(crate) use make;
-
-#[cfg(test)]
-mod test {
-    use super::super::tag::{self, Tag};
-
-    const TOK_A: [u8; 3] = [0xed, 0xef, 0x1c];
-    const TOK_B: [u8; 3] = [0xed, 0xf0, 0x1c];
-
-    const OFFSET: usize = 1;
-
-    make! {
-        enum Token[OFFSET] {
-            A = TOK_A,
-            B = TOK_B,
-        }
-    }
-
-    #[test]
-    fn example() {
-        assert_eq!(Token::from_u8(0xed), None);
-
-        let tag = Token::from_u8(0xef).unwrap();
-        assert_eq!(tag.as_bytes(), &TOK_A[..]);
-
-        let tag = Token::from_u8(0xf0).unwrap();
-        assert_eq!(tag.as_bytes(), &TOK_B[..]);
-    }
-}
-
 // The following functions are written somewhat unusually,
 // since they're const functions that cannot use iterators.
 
@@ -163,3 +133,33 @@ pub const fn min_of(mut xs: &[usize]) -> usize {
 pub const fn buf_of(xs: &[usize]) -> usize {
     max_of(&[min_of(xs), max_of(xs) - min_of(xs)])
 }
+
+pub(crate) use make;
+
+#[cfg(test)]
+mod test {
+    use super::super::tag::{self, Tag};
+
+    const TOK_A: [u8; 3] = [0xed, 0xef, 0x1c];
+    const TOK_B: [u8; 3] = [0xed, 0xf0, 0x1c];
+
+    const OFFSET: usize = 1;
+
+    make! {
+        enum Token[OFFSET] {
+            A = TOK_A,
+            B = TOK_B,
+        }
+    }
+
+    #[test]
+    fn example() {
+        assert_eq!(Token::from_u8(0xed), None);
+
+        let tag = Token::from_u8(0xef).unwrap();
+        assert_eq!(tag.as_bytes(), &TOK_A[..]);
+
+        let tag = Token::from_u8(0xf0).unwrap();
+        assert_eq!(tag.as_bytes(), &TOK_B[..]);
+    }
+}
diff --git a/tvix/store-go/default.nix b/tvix/store-go/default.nix
index f1f5a81548..e4c3efd7ad 100644
--- a/tvix/store-go/default.nix
+++ b/tvix/store-go/default.nix
@@ -18,7 +18,7 @@ in
         ${regenerate}
         if [[ -n "$(git status --porcelain -unormal)" ]]; then
             echo "-----------------------------"
-            echo ".pb.go files need to be updated, mg run //tvix/store-go/generate"
+            echo ".pb.go files need to be updated, mg run //tvix/store-go/regenerate"
             echo "-----------------------------"
             git status -unormal
             exit 1
diff --git a/tvix/store-go/pathinfo.pb.go b/tvix/store-go/pathinfo.pb.go
index 4b393ad4f3..23808765ba 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.31.0
+// 	protoc-gen-go v1.32.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 63df3bff24..6b8355ff24 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.31.0
+// 	protoc-gen-go v1.32.0
 // 	protoc        (unknown)
 // source: tvix/store/protos/rpc_pathinfo.proto