mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/nix-compat): absorb //tvix/derivation

Browse source 
Put this in its src/derivation.

Change-Id: Ic047ab1c2da555a833ee454e10ef60c77537b617
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7967
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2023-01-31 14:45:42 +01:00 • committed by clbot
parent 9e809e21cc
commit 2d24c5f260
34 changed files with 60 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

88
tvix/Cargo.nix
View file

@ -63,16 +63,6 @@ rec {
# File a bug if you depend on any for non-debug work!
debug = internal.debugCrate { inherit packageId; };
};
"tvix-derivation" = rec {
packageId = "tvix-derivation";
build = internal.buildRustCrateWithFeatures {
packageId = "tvix-derivation";
};
# Debug support which might change between releases.
# File a bug if you depend on any for non-debug work!
debug = internal.debugCrate { inherit packageId; };
};
"tvix-eval" = rec {
packageId = "tvix-eval";
build = internal.buildRustCrateWithFeatures {
@ -3758,6 +3748,11 @@ rec {
name = "glob";
packageId = "glob";
}
{
name = "serde";
packageId = "serde";
features = [ "derive" ];
}
{
name = "sha2";
packageId = "sha2 0.10.6";
@ -3768,10 +3763,18 @@ rec {
}
];
devDependencies = [
{
name = "serde_json";
packageId = "serde_json";
}
{
name = "test-case";
packageId = "test-case";
}
{
name = "test-generator";
packageId = "test-generator";
}
];
};
@ -7771,6 +7774,10 @@ rec {
name = "dirs";
packageId = "dirs";
}
{
name = "nix-compat";
packageId = "nix-compat";
}
{
name = "rustyline";
packageId = "rustyline";
@ -7787,73 +7794,12 @@ rec {
name = "thiserror";
packageId = "thiserror";
}
{
name = "tvix-derivation";
packageId = "tvix-derivation";
}
{
name = "tvix-eval";
packageId = "tvix-eval";
}
];
};
"tvix-derivation" = rec {
crateName = "tvix-derivation";
version = "0.1.0";
edition = "2021";
# We can't filter paths with references in Nix 2.4
# See https://github.com/NixOS/nix/issues/5410
src =
if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
then lib.cleanSourceWith { filter = sourceFilter; src = ./derivation; }
else ./derivation;
dependencies = [
{
name = "anyhow";
packageId = "anyhow";
}
{
name = "data-encoding";
packageId = "data-encoding";
}
{
name = "glob";
packageId = "glob";
}
{
name = "nix-compat";
packageId = "nix-compat";
}
{
name = "serde";
packageId = "serde";
features = [ "derive" ];
}
{
name = "sha2";
packageId = "sha2 0.10.6";
}
{
name = "thiserror";
packageId = "thiserror";
}
];
devDependencies = [
{
name = "serde_json";
packageId = "serde_json";
}
{
name = "test-case";
packageId = "test-case";
}
{
name = "test-generator";
packageId = "test-generator";
}
];
};
"tvix-eval" = rec {
crateName = "tvix-eval";