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

chore(snix): s/tvix/snix/

Browse source 
Change-Id: Iae961416eea0a38bc57df7b736f6dda5903b0828
This commit is contained in:
Florian Klink 2025-03-16 17:55:12 +00:00
parent 768f053416
commit 36e4d017f5
1417 changed files with 3741 additions and 3650 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4073,7 +4073,7 @@ rec {
version = "0.1.0";
edition = "2021";
crateBin = [ ];
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../tvix/nix-compat; };
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../snix/nix-compat; };
libName = "nix_compat";
dependencies = [
{
@ -4196,7 +4196,7 @@ rec {
crateName = "nix-compat-derive";
version = "0.1.0";
edition = "2021";
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../tvix/nix-compat-derive; };
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../snix/nix-compat-derive; };
procMacro = true;
libName = "nix_compat_derive";
dependencies = [

2
users/edef/crunch-v2/Cargo.toml
View file

@ -19,7 +19,7 @@ tokio = { version = "1.37.0", features = ["full"] }
rusoto_core = { version = "0.48.0", default-features = false, features = ["hyper-rustls"] }
rusoto_s3 = { version = "0.48.0", default-features = false, features = ["rustls"] }
nix-compat = { version = "0.1.0", path = "../../../tvix/nix-compat" }
nix-compat = { version = "0.1.0", path = "../../../snix/nix-compat" }
sled = "0.34.7"
fastcdc = "3.1.0"

6
users/edef/crunch-v2/default.nix
View file

@ -1,9 +1,9 @@
{ pkgs, depot, lib, ... }:
(pkgs.callPackage ./Cargo.nix {
defaultCrateOverrides = (depot.tvix.utils.defaultCrateOverridesForPkgs pkgs) // {
defaultCrateOverrides = (depot.snix.utils.defaultCrateOverridesForPkgs pkgs) // {
crunch-v2 = prev: {
src = depot.tvix.utils.filterRustCrateSrc rec {
src = depot.snix.utils.filterRustCrateSrc rec {
root = prev.src.origSrc;
extraFileset = lib.fileset.fileFilter (f: f.hasExt "proto") root;
};
@ -11,5 +11,5 @@
};
};
}).rootCrate.build.overrideAttrs {
meta.ci.extraSteps.crate2nix-check = depot.tvix.utils.mkCrate2nixCheck ./Cargo.nix;
meta.ci.extraSteps.crate2nix-check = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
}

2
users/edef/crunch-v2/protos/flatstore.proto
View file

@ -1,6 +1,6 @@
syntax = "proto3";
package tvix.flatstore.v1;
package snix.flatstore.v1;
message Path {
bytes nar_hash = 1;

2
users/edef/crunch-v2/src/lib.rs
View file

@ -1,3 +1,3 @@
pub mod proto {
include!(concat!(env!("OUT_DIR"), "/tvix.flatstore.v1.rs"));
include!(concat!(env!("OUT_DIR"), "/snix.flatstore.v1.rs"));
}

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

@ -5475,7 +5475,7 @@ rec {
version = "0.1.0";
edition = "2021";
crateBin = [ ];
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../tvix/nix-compat; };
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../snix/nix-compat; };
libName = "nix_compat";
dependencies = [
{
@ -5598,7 +5598,7 @@ rec {
crateName = "nix-compat-derive";
version = "0.1.0";
edition = "2021";
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../tvix/nix-compat-derive; };
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../snix/nix-compat-derive; };
procMacro = true;
libName = "nix_compat_derive";
dependencies = [

2
users/edef/fetchroots/Cargo.toml
View file

@ -16,7 +16,7 @@ bzip2 = "0.4.4"
chrono = "0.4.34"
futures = "0.3.30"
indicatif = "0.17.8"
nix-compat = { version = "0.1.0", path = "../../../tvix/nix-compat" }
nix-compat = { version = "0.1.0", path = "../../../snix/nix-compat" }
polars = { version = "0.36.2", features = ["parquet"] }
rayon = "1.8.1"
tokio = { version = "1.36.0", features = ["full"] }

6
users/edef/fetchroots/default.nix
View file

@ -1,11 +1,11 @@
{ pkgs, depot, ... }:
(pkgs.callPackage ./Cargo.nix {
defaultCrateOverrides = (depot.tvix.utils.defaultCrateOverridesForPkgs pkgs) // {
defaultCrateOverrides = (depot.snix.utils.defaultCrateOverridesForPkgs pkgs) // {
fetchroots = prev: {
src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
src = depot.snix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
};
};
}).rootCrate.build.overrideAttrs {
meta.ci.extraSteps.crate2nix = depot.tvix.utils.mkCrate2nixCheck ./Cargo.nix;
meta.ci.extraSteps.crate2nix = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
}

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

@ -2799,7 +2799,7 @@ rec {
version = "0.1.0";
edition = "2021";
crateBin = [ ];
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../tvix/nix-compat; };
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../snix/nix-compat; };
libName = "nix_compat";
dependencies = [
{
@ -2922,7 +2922,7 @@ rec {
crateName = "nix-compat-derive";
version = "0.1.0";
edition = "2021";
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../tvix/nix-compat-derive; };
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../snix/nix-compat-derive; };
procMacro = true;
libName = "nix_compat_derive";
dependencies = [

2
users/edef/narinfo2parquet/Cargo.toml
View file

@ -11,7 +11,7 @@ members = ["."]
[dependencies]
anyhow = { version = "1.0.75", features = ["backtrace"] }
jemallocator = "0.5.4"
nix-compat = { version = "0.1.0", path = "../../../tvix/nix-compat" }
nix-compat = { version = "0.1.0", path = "../../../snix/nix-compat" }
tempfile-fast = "0.3.4"
zstd = "0.13.0"

6
users/edef/narinfo2parquet/default.nix
View file

@ -1,11 +1,11 @@
{ pkgs, depot, ... }:
(pkgs.callPackage ./Cargo.nix {
defaultCrateOverrides = (depot.tvix.utils.defaultCrateOverridesForPkgs pkgs) // {
defaultCrateOverrides = (depot.snix.utils.defaultCrateOverridesForPkgs pkgs) // {
narinfo2parquet = prev: {
src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
src = depot.snix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
};
};
}).rootCrate.build.overrideAttrs {
meta.ci.extraSteps.crate2nix = depot.tvix.utils.mkCrate2nixCheck ./Cargo.nix;
meta.ci.extraSteps.crate2nix = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
}

2
users/edef/turbofetch/Cargo.toml
View file

@ -3,7 +3,7 @@ name = "turbofetch"
version = "0.1.0"
edition = "2021"
# We don't join the //tvix workspace, as this is fairly cache.nixos.org-specific.
# We don't join the //snix workspace, as this is fairly cache.nixos.org-specific.
[workspace]
members = ["."]

6
users/edef/turbofetch/default.nix
View file

@ -1,11 +1,11 @@
{ pkgs, depot, ... }:
(pkgs.callPackage ./Cargo.nix {
defaultCrateOverrides = (depot.tvix.utils.defaultCrateOverridesForPkgs pkgs) // {
defaultCrateOverrides = (depot.snix.utils.defaultCrateOverridesForPkgs pkgs) // {
turbofetch = prev: {
src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
src = depot.snix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
};
};
}).rootCrate.build.overrideAttrs {
meta.ci.extraSteps.crate2nix-check = depot.tvix.utils.mkCrate2nixCheck ./Cargo.nix;
meta.ci.extraSteps.crate2nix-check = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
}

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

@ -1846,6 +1846,18 @@ version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
[[package]]
name = "snix-tracing"
version = "0.1.0"
dependencies = [
"indicatif",
"thiserror 2.0.11",
"tokio",
"tracing",
"tracing-indicatif",
"tracing-subscriber",
]
[[package]]
name = "socket2"
version = "0.5.7"
@ -2168,18 +2180,6 @@ dependencies = [
"tracing-log",
]
[[package]]
name = "tvix-tracing"
version = "0.1.0"
dependencies = [
"indicatif",
"thiserror 2.0.11",
"tokio",
"tracing",
"tracing-indicatif",
"tracing-subscriber",
]
[[package]]
name = "typenum"
version = "1.17.0"
@ -2321,9 +2321,9 @@ dependencies = [
"rayon",
"rustc-hash",
"safer_owning_ref",
"snix-tracing",
"tracing",
"tracing-indicatif",
"tvix-tracing",
]
[[package]]

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

@ -2882,7 +2882,7 @@ rec {
version = "0.1.0";
edition = "2021";
crateBin = [ ];
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../tvix/nix-compat; };
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../snix/nix-compat; };
libName = "nix_compat";
dependencies = [
{
@ -3005,7 +3005,7 @@ rec {
crateName = "nix-compat-derive";
version = "0.1.0";
edition = "2021";
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../tvix/nix-compat-derive; };
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../snix/nix-compat-derive; };
procMacro = true;
libName = "nix_compat_derive";
dependencies = [
@ -6214,6 +6214,50 @@ rec {
];
};
"snix-tracing" = rec {
crateName = "snix-tracing";
version = "0.1.0";
edition = "2021";
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../snix/tracing; };
libName = "snix_tracing";
dependencies = [
{
name = "indicatif";
packageId = "indicatif";
}
{
name = "thiserror";
packageId = "thiserror 2.0.11";
}
{
name = "tokio";
packageId = "tokio";
features = [ "sync" "rt" ];
}
{
name = "tracing";
packageId = "tracing";
features = [ "max_level_trace" "release_max_level_debug" ];
}
{
name = "tracing-indicatif";
packageId = "tracing-indicatif";
}
{
name = "tracing-subscriber";
packageId = "tracing-subscriber";
features = [ "env-filter" ];
}
];
features = {
"axum" = [ "dep:axum" ];
"otlp" = [ "dep:tracing-opentelemetry" "dep:opentelemetry" "dep:opentelemetry-otlp" "dep:opentelemetry_sdk" "dep:opentelemetry-http" "dep:opentelemetry-semantic-conventions" "reqwest-tracing?/opentelemetry_0_28" ];
"reqwest" = [ "dep:reqwest-tracing" ];
"tonic" = [ "dep:tonic" "dep:http" ];
"tracy" = [ "dep:tracing-tracy" ];
};
resolvedDefaultFeatures = [ "default" ];
};
"socket2" = rec {
crateName = "socket2";
version = "0.5.7";
@ -7178,50 +7222,6 @@ rec {
};
resolvedDefaultFeatures = [ "alloc" "ansi" "default" "env-filter" "fmt" "matchers" "nu-ansi-term" "once_cell" "regex" "registry" "sharded-slab" "smallvec" "std" "thread_local" "tracing" "tracing-log" ];
};
"tvix-tracing" = rec {
crateName = "tvix-tracing";
version = "0.1.0";
edition = "2021";
src = lib.cleanSourceWith { filter = sourceFilter; src = ../../../tvix/tracing; };
libName = "tvix_tracing";
dependencies = [
{
name = "indicatif";
packageId = "indicatif";
}
{
name = "thiserror";
packageId = "thiserror 2.0.11";
}
{
name = "tokio";
packageId = "tokio";
features = [ "sync" "rt" ];
}
{
name = "tracing";
packageId = "tracing";
features = [ "max_level_trace" "release_max_level_debug" ];
}
{
name = "tracing-indicatif";
packageId = "tracing-indicatif";
}
{
name = "tracing-subscriber";
packageId = "tracing-subscriber";
features = [ "env-filter" ];
}
];
features = {
"axum" = [ "dep:axum" ];
"otlp" = [ "dep:tracing-opentelemetry" "dep:opentelemetry" "dep:opentelemetry-otlp" "dep:opentelemetry_sdk" "dep:opentelemetry-http" "dep:opentelemetry-semantic-conventions" "reqwest-tracing?/opentelemetry_0_28" ];
"reqwest" = [ "dep:reqwest-tracing" ];
"tonic" = [ "dep:tonic" "dep:http" ];
"tracy" = [ "dep:tracing-tracy" ];
};
resolvedDefaultFeatures = [ "default" ];
};
"typenum" = rec {
crateName = "typenum";
version = "1.17.0";
@ -7614,6 +7614,10 @@ rec {
name = "safer_owning_ref";
packageId = "safer_owning_ref";
}
{
name = "snix-tracing";
packageId = "snix-tracing";
}
{
name = "tracing";
packageId = "tracing";
@ -7622,10 +7626,6 @@ rec {
name = "tracing-indicatif";
packageId = "tracing-indicatif";
}
{
name = "tvix-tracing";
packageId = "tvix-tracing";
}
];
};

4
users/edef/weave/Cargo.toml
View file

@ -10,11 +10,11 @@ members = ["."]
[dependencies]
anyhow = { version = "1.0.79", features = ["backtrace"] }
hashbrown = "0.14.3"
nix-compat = { version = "0.1.0", path = "../../../tvix/nix-compat" }
nix-compat = { version = "0.1.0", path = "../../../snix/nix-compat" }
safer_owning_ref = "0.5.0"
rayon = "1.8.1"
rustc-hash = "2.0.0"
tvix-tracing = { version = "0.1.0", path = "../../../tvix/tracing" }
snix-tracing = { version = "0.1.0", path = "../../../snix/tracing" }
tracing = "0.1.40"
tracing-indicatif = "0.3.6"

6
users/edef/weave/default.nix
View file

@ -1,11 +1,11 @@
{ pkgs, depot, ... }:
(pkgs.callPackage ./Cargo.nix {
defaultCrateOverrides = (depot.tvix.utils.defaultCrateOverridesForPkgs pkgs) // {
defaultCrateOverrides = (depot.snix.utils.defaultCrateOverridesForPkgs pkgs) // {
weave = prev: {
src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
src = depot.snix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
};
};
}).rootCrate.build.overrideAttrs {
meta.ci.extraSteps.crate2nix-check = depot.tvix.utils.mkCrate2nixCheck ./Cargo.nix;
meta.ci.extraSteps.crate2nix-check = depot.snix.utils.mkCrate2nixCheck ./Cargo.nix;
}

2
users/edef/weave/src/bin/swizzle.rs
View file

@ -43,7 +43,7 @@ use weave::{as_fixed_binary, hash64, leak, load_ph_array, INDEX_NULL};
#[tracing::instrument]
fn main() -> Result<()> {
let _tracing = tvix_tracing::TracingBuilder::default()
let _tracing = snix_tracing::TracingBuilder::default()
.enable_progressbar()
.build()?;

4
users/edef/weave/src/main.rs
View file

@ -29,7 +29,7 @@ use weave::{as_fixed_binary, hash64, INDEX_NULL};
#[tracing::instrument]
fn main() -> Result<()> {
let _tracing = tvix_tracing::TracingBuilder::default()
let _tracing = snix_tracing::TracingBuilder::default()
.enable_progressbar()
.build()?;
@ -121,7 +121,7 @@ fn main() -> Result<()> {
{
let span = info_span!("mark", indicatif.pb_show = tracing::field::Empty).entered();
span.pb_set_message("marking");
span.pb_set_style(&tvix_tracing::PB_PROGRESS_STYLE);
span.pb_set_style(&snix_tracing::PB_PROGRESS_STYLE);
while !todo.is_empty() {
span.pb_set_length(seen.len() as u64);

2
users/flokli/nixos/nixos-tvix-cache/nar-bridge-module.nix
View file

@ -8,7 +8,7 @@
let
cfg = config.services.nar-bridge;
package = depot.tvix.nar-bridge.override (old: {
package = depot.snix.nar-bridge.override (old: {
features = old.features or [ "default" ] ++ [ "xp-store-composition-cli" ];
runTests = true;
});