about summary refs log tree commit diff
path: root/tvix/nix-compat/src/derivation/parser.rs
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2024-01-13T18·21+0100
committerclbot <clbot@tvl.fyi>2024-01-19T21·47+0000
commit526295a71d205f68a3000884981b9312fc400469 (patch)
tree3e39deeb38651ff10659b2b7c319f3d141c9a54b /tvix/nix-compat/src/derivation/parser.rs
parent9a09505b777cbfadff0a86f69d7a50b33ed1b835 (diff)
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>
Diffstat (limited to 'tvix/nix-compat/src/derivation/parser.rs')
-rw-r--r--tvix/nix-compat/src/derivation/parser.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/tvix/nix-compat/src/derivation/parser.rs b/tvix/nix-compat/src/derivation/parser.rs
index f54852cb229c..7ffa6fd46eb6 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)
         }