maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(nix-compat): bump to nom 8.x

Browse source 
See 72dd5818b7/CHANGELOG.md
for the nom changelog.

Most notably, there's now a .parse() to be added:

`combinator(arg)(input)` -> `combinator(arg).parse(input)`

There also doesn't need to be a tuple combinator (it's implemented on
tuples directly).

This also refactors the string / byte field parsing parts, to make them
more concise.

Change-Id: I9e8a3cedd07d6705be391898eb6a486fb8164069
Reviewed-on: https://cl.tvl.fyi/c/depot/+/13193
Tested-by: BuildkiteCI
Reviewed-by: edef <edef@edef.eu>
Reviewed-by: Brian Olsen <me@griff.name>
This commit is contained in:
Florian Klink 2025-03-02 22:06:11 +07:00 • committed by flokli
parent 2daa483249
commit a512f16424
15 changed files with 83 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tvix/Cargo.lock generated
View file

@ -2396,12 +2396,6 @@ dependencies = [
"unicase", "unicase",
] ]
[[package]]
name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.8.2" version = "0.8.2"
@ -2671,12 +2665,11 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
[[package]] [[package]]
name = "nom" name = "nom"
version = "7.1.3" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
dependencies = [ dependencies = [
"memchr", "memchr",
"minimal-lexical",
] ]
[[package]] [[package]]

27
tvix/Cargo.nix
View file

@ -7513,20 +7513,6 @@ rec {
}; };
resolvedDefaultFeatures = [ "default" "rev-mappings" ]; resolvedDefaultFeatures = [ "default" "rev-mappings" ];
}; };
"minimal-lexical" = rec {
crateName = "minimal-lexical";
version = "0.2.1";
edition = "2018";
sha256 = "16ppc5g84aijpri4jzv14rvcnslvlpphbszc7zzp6vfkddf4qdb8";
libName = "minimal_lexical";
authors = [
"Alex Huszagh <ahuszagh@gmail.com>"
];
features = {
"default" = [ "std" ];
};
resolvedDefaultFeatures = [ "std" ];
};
"miniz_oxide" = rec { "miniz_oxide" = rec {
crateName = "miniz_oxide"; crateName = "miniz_oxide";
version = "0.8.2"; version = "0.8.2";
@ -8528,9 +8514,9 @@ rec {
}; };
"nom" = rec { "nom" = rec {
crateName = "nom"; crateName = "nom";
version = "7.1.3"; version = "8.0.0";
edition = "2018"; edition = "2021";
sha256 = "0jha9901wxam390jcf5pfa0qqfrgh8li787jx2ip0yk5b8y9hwyj"; sha256 = "01cl5xng9d0gxf26h39m0l8lprgpa00fcc75ps1yzgbib1vn35yz";
authors = [ authors = [
"contact@geoffroycouprie.com" "contact@geoffroycouprie.com"
]; ];
@ -8540,15 +8526,10 @@ rec {
packageId = "memchr"; packageId = "memchr";
usesDefaultFeatures = false; usesDefaultFeatures = false;
} }
{
name = "minimal-lexical";
packageId = "minimal-lexical";
usesDefaultFeatures = false;
}
]; ];
features = { features = {
"default" = [ "std" ]; "default" = [ "std" ];
"std" = [ "alloc" "memchr/std" "minimal-lexical/std" ]; "std" = [ "alloc" "memchr/std" ];
}; };
resolvedDefaultFeatures = [ "alloc" "default" "std" ]; resolvedDefaultFeatures = [ "alloc" "default" "std" ];
}; };

2
tvix/Cargo.toml
View file

@ -85,7 +85,7 @@ md-5 = "0.10.6"
mimalloc = "0.1.43" mimalloc = "0.1.43"
nix = "0.27.1" nix = "0.27.1"
nohash-hasher = "0.2.0" nohash-hasher = "0.2.0"
nom = "7.1.3" nom = "8.0"
num-traits = "0.2.19" num-traits = "0.2.19"
object_store = "0.10.2" object_store = "0.10.2"
opentelemetry = "0.28.0" opentelemetry = "0.28.0"

39
tvix/nix-compat/src/aterm/parser.rs
View file

@ -4,12 +4,12 @@
//! [ATerm]: http://program-transformation.org/Tools/ATermFormat.html //! [ATerm]: http://program-transformation.org/Tools/ATermFormat.html
use bstr::BString; use bstr::BString;
use nom::branch::alt; use nom::branch::alt;
use nom::bytes::complete::{escaped_transform, is_not, tag}; use nom::bytes::complete::{escaped_transform, is_not};
use nom::character::complete::char as nomchar; use nom::character::complete::char as nomchar;
use nom::combinator::{map, value}; use nom::combinator::{map_res, opt, value};
use nom::multi::separated_list0; use nom::multi::separated_list0;
use nom::sequence::delimited; use nom::sequence::delimited;
use nom::IResult; use nom::{IResult, Parser};
/// Parse a bstr and undo any escaping (which is why this needs to allocate). /// Parse a bstr and undo any escaping (which is why this needs to allocate).
// FUTUREWORK: have a version for fields that are known to not need escaping // FUTUREWORK: have a version for fields that are known to not need escaping
@ -32,48 +32,37 @@ fn parse_escaped_bytes(i: &[u8]) -> IResult<&[u8], BString> {
/// Parse a field in double quotes, undo any escaping, and return the unquoted /// Parse a field in double quotes, undo any escaping, and return the unquoted
/// and decoded `Vec<u8>`. /// and decoded `Vec<u8>`.
pub(crate) fn parse_bytes_field(i: &[u8]) -> IResult<&[u8], BString> { pub(crate) fn parse_bytes_field(i: &[u8]) -> IResult<&[u8], BString> {
// inside double quotes…
delimited( delimited(
nomchar('\"'), nomchar('\"'),
// There is opt(parse_escaped_bytes).map(|opt_bstr| opt_bstr.unwrap_or_default()),
alt((
// …either is a bstr after unescaping
parse_escaped_bytes,
// …or an empty string.
map(tag(b""), |_| BString::default()),
)),
nomchar('\"'), nomchar('\"'),
)(i) )
.parse(i)
} }
/// Parse a field in double quotes, undo any escaping, and return the unquoted /// Parse a field in double quotes, undo any escaping, and return the unquoted
/// and decoded [String], if it's valid UTF-8. /// and decoded [String], if it's valid UTF-8.
/// Or fail parsing if the bytes are no valid UTF-8. /// Or fail parsing if the bytes are no valid UTF-8.
pub(crate) fn parse_string_field(i: &[u8]) -> IResult<&[u8], String> { pub(crate) fn parse_string_field(i: &[u8]) -> IResult<&[u8], String> {
// inside double quotes…
delimited( delimited(
nomchar('\"'), nomchar('\"'),
// There is map_res(
alt(( opt(parse_escaped_bytes).map(|opt_bstr| opt_bstr.unwrap_or_default()),
// either is a String after unescaping |bstr| String::from_utf8(bstr.to_vec()),
nom::combinator::map_opt(parse_escaped_bytes, |escaped_bytes| { ),
String::from_utf8(escaped_bytes.into()).ok()
}),
// or an empty string.
map(tag(b""), |_| "".to_string()),
)),
nomchar('\"'), nomchar('\"'),
)(i) )
.parse(i)
} }
/// Parse a list of string fields (enclosed in brackets) /// Parse a list of string fields (enclosed in brackets)
pub(crate) fn parse_string_list(i: &[u8]) -> IResult<&[u8], Vec<String>> { pub(crate) fn parse_string_list(i: &[u8]) -> IResult<&[u8], Vec<String>> {
// inside brackets
delimited( delimited(
nomchar('['), nomchar('['),
separated_list0(nomchar(','), parse_string_field), separated_list0(nomchar(','), parse_string_field),
nomchar(']'), nomchar(']'),
)(i) )
.parse(i)
} }
#[cfg(test)] #[cfg(test)]

45
tvix/nix-compat/src/derivation/parser.rs
View file

@ -7,7 +7,8 @@ use nom::bytes::complete::tag;
use nom::character::complete::char as nomchar; use nom::character::complete::char as nomchar;
use nom::combinator::{all_consuming, map_res}; use nom::combinator::{all_consuming, map_res};
use nom::multi::{separated_list0, separated_list1}; use nom::multi::{separated_list0, separated_list1};
use nom::sequence::{delimited, preceded, separated_pair, terminated, tuple}; use nom::sequence::{delimited, preceded, separated_pair, terminated};
use nom::Parser;
use std::collections::{btree_map, BTreeMap, BTreeSet}; use std::collections::{btree_map, BTreeMap, BTreeSet};
use thiserror; use thiserror;
@ -27,7 +28,7 @@ pub enum Error<I> {
} }
pub(crate) fn parse(i: &[u8]) -> Result<Derivation, Error<&[u8]>> { pub(crate) fn parse(i: &[u8]) -> Result<Derivation, Error<&[u8]>> {
match all_consuming(parse_derivation)(i) { match all_consuming(parse_derivation).parse(i) {
Ok((rest, derivation)) => { Ok((rest, derivation)) => {
// this shouldn't happen, as all_consuming shouldn't return. // this shouldn't happen, as all_consuming shouldn't return.
debug_assert!(rest.is_empty()); debug_assert!(rest.is_empty());
@ -68,12 +69,13 @@ fn parse_output(i: &[u8]) -> NomResult<&[u8], (String, Output)> {
nomchar('('), nomchar('('),
map_res( map_res(
|i| { |i| {
tuple(( (
terminated(aterm::parse_string_field, nomchar(',')), terminated(aterm::parse_string_field, nomchar(',')),
terminated(aterm::parse_string_field, nomchar(',')), terminated(aterm::parse_string_field, nomchar(',')),
terminated(aterm::parse_string_field, nomchar(',')), terminated(aterm::parse_string_field, nomchar(',')),
aterm::parse_bytes_field, aterm::parse_bytes_field,
))(i) )
.parse(i)
.map_err(into_nomerror) .map_err(into_nomerror)
}, },
|(output_name, output_path, algo_and_mode, encoded_digest)| { |(output_name, output_path, algo_and_mode, encoded_digest)| {
@ -114,7 +116,8 @@ fn parse_output(i: &[u8]) -> NomResult<&[u8], (String, Output)> {
}, },
), ),
nomchar(')'), nomchar(')'),
)(i) )
.parse(i)
} }
/// Parse multiple outputs in ATerm. This is a list of things acccepted by /// Parse multiple outputs in ATerm. This is a list of things acccepted by
@ -127,7 +130,8 @@ fn parse_outputs(i: &[u8]) -> NomResult<&[u8], BTreeMap<String, Output>> {
nomchar('['), nomchar('['),
separated_list1(tag(","), parse_output), separated_list1(tag(","), parse_output),
nomchar(']'), nomchar(']'),
)(i); )
.parse(i);
match res { match res {
Ok((rst, outputs_lst)) => { Ok((rst, outputs_lst)) => {
@ -228,7 +232,7 @@ pub fn parse_derivation(i: &[u8]) -> NomResult<&[u8], Derivation> {
nomchar('('), nomchar('('),
// tuple requires all errors to be of the same type, so we need to be a // tuple requires all errors to be of the same type, so we need to be a
// bit verbose here wrapping generic IResult into [NomATermResult]. // bit verbose here wrapping generic IResult into [NomATermResult].
tuple(( (
// parse outputs // parse outputs
terminated(parse_outputs, nomchar(',')), terminated(parse_outputs, nomchar(',')),
// // parse input derivations // // parse input derivations
@ -236,14 +240,26 @@ pub fn parse_derivation(i: &[u8]) -> NomResult<&[u8], Derivation> {
// // parse input sources // // parse input sources
terminated(parse_input_sources, nomchar(',')), terminated(parse_input_sources, nomchar(',')),
// // parse system // // parse system
|i| terminated(aterm::parse_string_field, nomchar(','))(i).map_err(into_nomerror), |i| {
terminated(aterm::parse_string_field, nomchar(','))
.parse(i)
.map_err(into_nomerror)
},
// // parse builder // // parse builder
|i| terminated(aterm::parse_string_field, nomchar(','))(i).map_err(into_nomerror), |i| {
terminated(aterm::parse_string_field, nomchar(','))
.parse(i)
.map_err(into_nomerror)
},
// // parse arguments // // parse arguments
|i| terminated(aterm::parse_string_list, nomchar(','))(i).map_err(into_nomerror), |i| {
terminated(aterm::parse_string_list, nomchar(','))
.parse(i)
.map_err(into_nomerror)
},
// parse environment // parse environment
parse_kv(aterm::parse_bytes_field), parse_kv(aterm::parse_bytes_field),
)), ),
nomchar(')'), nomchar(')'),
) )
.map( .map(
@ -267,7 +283,8 @@ pub fn parse_derivation(i: &[u8]) -> NomResult<&[u8], Derivation> {
} }
}, },
), ),
)(i) )
.parse(i)
} }
/// Parse a list of key/value pairs into a BTreeMap. /// Parse a list of key/value pairs into a BTreeMap.
@ -298,7 +315,7 @@ where
), ),
nomchar(')'), nomchar(')'),
), ),
)(ii).map_err(into_nomerror); ).parse(ii).map_err(into_nomerror);
match res { match res {
Ok((rest, pairs)) => { Ok((rest, pairs)) => {
@ -322,7 +339,7 @@ where
} }
}, },
nomchar(']'), nomchar(']'),
)(i) ).parse(i)
} }
#[cfg(test)] #[cfg(test)]

11
users/edef/crunch-v2/Cargo.lock generated
View file

@ -1359,12 +1359,6 @@ dependencies = [
"libmimalloc-sys", "libmimalloc-sys",
] ]
[[package]]
name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.8.0" version = "0.8.0"
@ -1452,12 +1446,11 @@ dependencies = [
[[package]] [[package]]
name = "nom" name = "nom"
version = "7.1.3" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
dependencies = [ dependencies = [
"memchr", "memchr",
"minimal-lexical",
] ]
[[package]] [[package]]

27
users/edef/crunch-v2/Cargo.nix
View file

@ -3922,20 +3922,6 @@ rec {
}; };
resolvedDefaultFeatures = [ "default" ]; resolvedDefaultFeatures = [ "default" ];
}; };
"minimal-lexical" = rec {
crateName = "minimal-lexical";
version = "0.2.1";
edition = "2018";
sha256 = "16ppc5g84aijpri4jzv14rvcnslvlpphbszc7zzp6vfkddf4qdb8";
libName = "minimal_lexical";
authors = [
"Alex Huszagh <ahuszagh@gmail.com>"
];
features = {
"default" = [ "std" ];
};
resolvedDefaultFeatures = [ "std" ];
};
"miniz_oxide" = rec { "miniz_oxide" = rec {
crateName = "miniz_oxide"; crateName = "miniz_oxide";
version = "0.8.0"; version = "0.8.0";
@ -4238,9 +4224,9 @@ rec {
}; };
"nom" = rec { "nom" = rec {
crateName = "nom"; crateName = "nom";
version = "7.1.3"; version = "8.0.0";
edition = "2018"; edition = "2021";
sha256 = "0jha9901wxam390jcf5pfa0qqfrgh8li787jx2ip0yk5b8y9hwyj"; sha256 = "01cl5xng9d0gxf26h39m0l8lprgpa00fcc75ps1yzgbib1vn35yz";
authors = [ authors = [
"contact@geoffroycouprie.com" "contact@geoffroycouprie.com"
]; ];
@ -4250,15 +4236,10 @@ rec {
packageId = "memchr"; packageId = "memchr";
usesDefaultFeatures = false; usesDefaultFeatures = false;
} }
{
name = "minimal-lexical";
packageId = "minimal-lexical";
usesDefaultFeatures = false;
}
]; ];
features = { features = {
"default" = [ "std" ]; "default" = [ "std" ];
"std" = [ "alloc" "memchr/std" "minimal-lexical/std" ]; "std" = [ "alloc" "memchr/std" ];
}; };
resolvedDefaultFeatures = [ "alloc" "default" "std" ]; resolvedDefaultFeatures = [ "alloc" "default" "std" ];
}; };

11
users/edef/fetchroots/Cargo.lock generated
View file

@ -1634,12 +1634,6 @@ dependencies = [
"libmimalloc-sys", "libmimalloc-sys",
] ]
[[package]]
name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.7.2" version = "0.7.2"
@ -1721,12 +1715,11 @@ dependencies = [
[[package]] [[package]]
name = "nom" name = "nom"
version = "7.1.3" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
dependencies = [ dependencies = [
"memchr", "memchr",
"minimal-lexical",
] ]
[[package]] [[package]]

27
users/edef/fetchroots/Cargo.nix
View file

@ -5338,20 +5338,6 @@ rec {
}; };
resolvedDefaultFeatures = [ "default" ]; resolvedDefaultFeatures = [ "default" ];
}; };
"minimal-lexical" = rec {
crateName = "minimal-lexical";
version = "0.2.1";
edition = "2018";
sha256 = "16ppc5g84aijpri4jzv14rvcnslvlpphbszc7zzp6vfkddf4qdb8";
libName = "minimal_lexical";
authors = [
"Alex Huszagh <ahuszagh@gmail.com>"
];
features = {
"default" = [ "std" ];
};
resolvedDefaultFeatures = [ "std" ];
};
"miniz_oxide" = rec { "miniz_oxide" = rec {
crateName = "miniz_oxide"; crateName = "miniz_oxide";
version = "0.7.2"; version = "0.7.2";
@ -5640,9 +5626,9 @@ rec {
}; };
"nom" = rec { "nom" = rec {
crateName = "nom"; crateName = "nom";
version = "7.1.3"; version = "8.0.0";
edition = "2018"; edition = "2021";
sha256 = "0jha9901wxam390jcf5pfa0qqfrgh8li787jx2ip0yk5b8y9hwyj"; sha256 = "01cl5xng9d0gxf26h39m0l8lprgpa00fcc75ps1yzgbib1vn35yz";
authors = [ authors = [
"contact@geoffroycouprie.com" "contact@geoffroycouprie.com"
]; ];
@ -5652,15 +5638,10 @@ rec {
packageId = "memchr"; packageId = "memchr";
usesDefaultFeatures = false; usesDefaultFeatures = false;
} }
{
name = "minimal-lexical";
packageId = "minimal-lexical";
usesDefaultFeatures = false;
}
]; ];
features = { features = {
"default" = [ "std" ]; "default" = [ "std" ];
"std" = [ "alloc" "memchr/std" "minimal-lexical/std" ]; "std" = [ "alloc" "memchr/std" ];
}; };
resolvedDefaultFeatures = [ "alloc" "default" "std" ]; resolvedDefaultFeatures = [ "alloc" "default" "std" ];
}; };

11
users/edef/narinfo2parquet/Cargo.lock generated
View file

@ -896,12 +896,6 @@ dependencies = [
"libmimalloc-sys", "libmimalloc-sys",
] ]
[[package]]
name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.7.1" version = "0.7.1"
@ -996,12 +990,11 @@ dependencies = [
[[package]] [[package]]
name = "nom" name = "nom"
version = "7.1.3" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
dependencies = [ dependencies = [
"memchr", "memchr",
"minimal-lexical",
] ]
[[package]] [[package]]

27
users/edef/narinfo2parquet/Cargo.nix
View file

@ -2614,20 +2614,6 @@ rec {
}; };
resolvedDefaultFeatures = [ "default" ]; resolvedDefaultFeatures = [ "default" ];
}; };
"minimal-lexical" = rec {
crateName = "minimal-lexical";
version = "0.2.1";
edition = "2018";
sha256 = "16ppc5g84aijpri4jzv14rvcnslvlpphbszc7zzp6vfkddf4qdb8";
libName = "minimal_lexical";
authors = [
"Alex Huszagh <ahuszagh@gmail.com>"
];
features = {
"default" = [ "std" ];
};
resolvedDefaultFeatures = [ "std" ];
};
"miniz_oxide" = rec { "miniz_oxide" = rec {
crateName = "miniz_oxide"; crateName = "miniz_oxide";
version = "0.7.1"; version = "0.7.1";
@ -2964,9 +2950,9 @@ rec {
}; };
"nom" = rec { "nom" = rec {
crateName = "nom"; crateName = "nom";
version = "7.1.3"; version = "8.0.0";
edition = "2018"; edition = "2021";
sha256 = "0jha9901wxam390jcf5pfa0qqfrgh8li787jx2ip0yk5b8y9hwyj"; sha256 = "01cl5xng9d0gxf26h39m0l8lprgpa00fcc75ps1yzgbib1vn35yz";
authors = [ authors = [
"contact@geoffroycouprie.com" "contact@geoffroycouprie.com"
]; ];
@ -2976,15 +2962,10 @@ rec {
packageId = "memchr"; packageId = "memchr";
usesDefaultFeatures = false; usesDefaultFeatures = false;
} }
{
name = "minimal-lexical";
packageId = "minimal-lexical";
usesDefaultFeatures = false;
}
]; ];
features = { features = {
"default" = [ "std" ]; "default" = [ "std" ];
"std" = [ "alloc" "memchr/std" "minimal-lexical/std" ]; "std" = [ "alloc" "memchr/std" ];
}; };
resolvedDefaultFeatures = [ "alloc" "default" "std" ]; resolvedDefaultFeatures = [ "alloc" "default" "std" ];
}; };

11
users/edef/weave/Cargo.lock generated
View file

@ -948,12 +948,6 @@ dependencies = [
"libmimalloc-sys", "libmimalloc-sys",
] ]
[[package]]
name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.8.0" version = "0.8.0"
@ -1035,12 +1029,11 @@ dependencies = [
[[package]] [[package]]
name = "nom" name = "nom"
version = "7.1.3" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
dependencies = [ dependencies = [
"memchr", "memchr",
"minimal-lexical",
] ]
[[package]] [[package]]

27
users/edef/weave/Cargo.nix
View file

@ -2745,20 +2745,6 @@ rec {
}; };
resolvedDefaultFeatures = [ "default" ]; resolvedDefaultFeatures = [ "default" ];
}; };
"minimal-lexical" = rec {
crateName = "minimal-lexical";
version = "0.2.1";
edition = "2018";
sha256 = "16ppc5g84aijpri4jzv14rvcnslvlpphbszc7zzp6vfkddf4qdb8";
libName = "minimal_lexical";
authors = [
"Alex Huszagh <ahuszagh@gmail.com>"
];
features = {
"default" = [ "std" ];
};
resolvedDefaultFeatures = [ "std" ];
};
"miniz_oxide" = rec { "miniz_oxide" = rec {
crateName = "miniz_oxide"; crateName = "miniz_oxide";
version = "0.8.0"; version = "0.8.0";
@ -3047,9 +3033,9 @@ rec {
}; };
"nom" = rec { "nom" = rec {
crateName = "nom"; crateName = "nom";
version = "7.1.3"; version = "8.0.0";
edition = "2018"; edition = "2021";
sha256 = "0jha9901wxam390jcf5pfa0qqfrgh8li787jx2ip0yk5b8y9hwyj"; sha256 = "01cl5xng9d0gxf26h39m0l8lprgpa00fcc75ps1yzgbib1vn35yz";
authors = [ authors = [
"contact@geoffroycouprie.com" "contact@geoffroycouprie.com"
]; ];
@ -3059,15 +3045,10 @@ rec {
packageId = "memchr"; packageId = "memchr";
usesDefaultFeatures = false; usesDefaultFeatures = false;
} }
{
name = "minimal-lexical";
packageId = "minimal-lexical";
usesDefaultFeatures = false;
}
]; ];
features = { features = {
"default" = [ "std" ]; "default" = [ "std" ];
"std" = [ "alloc" "memchr/std" "minimal-lexical/std" ]; "std" = [ "alloc" "memchr/std" ];
}; };
resolvedDefaultFeatures = [ "alloc" "default" "std" ]; resolvedDefaultFeatures = [ "alloc" "default" "std" ];
}; };

11
users/picnoir/tvix-daemon/Cargo.lock generated
View file

@ -743,12 +743,6 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]] [[package]]
name = "miniz_oxide" name = "miniz_oxide"
version = "0.8.0" version = "0.8.0"
@ -819,12 +813,11 @@ dependencies = [
[[package]] [[package]]
name = "nom" name = "nom"
version = "7.1.3" version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405"
dependencies = [ dependencies = [
"memchr", "memchr",
"minimal-lexical",
] ]
[[package]] [[package]]

27
users/picnoir/tvix-daemon/Cargo.nix
View file

@ -2303,20 +2303,6 @@ rec {
]; ];
}; };
"minimal-lexical" = rec {
crateName = "minimal-lexical";
version = "0.2.1";
edition = "2018";
sha256 = "16ppc5g84aijpri4jzv14rvcnslvlpphbszc7zzp6vfkddf4qdb8";
libName = "minimal_lexical";
authors = [
"Alex Huszagh <ahuszagh@gmail.com>"
];
features = {
"default" = [ "std" ];
};
resolvedDefaultFeatures = [ "std" ];
};
"miniz_oxide" = rec { "miniz_oxide" = rec {
crateName = "miniz_oxide"; crateName = "miniz_oxide";
version = "0.8.0"; version = "0.8.0";
@ -2587,9 +2573,9 @@ rec {
}; };
"nom" = rec { "nom" = rec {
crateName = "nom"; crateName = "nom";
version = "7.1.3"; version = "8.0.0";
edition = "2018"; edition = "2021";
sha256 = "0jha9901wxam390jcf5pfa0qqfrgh8li787jx2ip0yk5b8y9hwyj"; sha256 = "01cl5xng9d0gxf26h39m0l8lprgpa00fcc75ps1yzgbib1vn35yz";
authors = [ authors = [
"contact@geoffroycouprie.com" "contact@geoffroycouprie.com"
]; ];
@ -2599,15 +2585,10 @@ rec {
packageId = "memchr"; packageId = "memchr";
usesDefaultFeatures = false; usesDefaultFeatures = false;
} }
{
name = "minimal-lexical";
packageId = "minimal-lexical";
usesDefaultFeatures = false;
}
]; ];
features = { features = {
"default" = [ "std" ]; "default" = [ "std" ];
"std" = [ "alloc" "memchr/std" "minimal-lexical/std" ]; "std" = [ "alloc" "memchr/std" ];
}; };
resolvedDefaultFeatures = [ "alloc" "default" "std" ]; resolvedDefaultFeatures = [ "alloc" "default" "std" ];
}; };