refactor(pkgs): clean up only one big tvix pkg
This commit is contained in:
parent
7cfb401000
commit
066248d032
5 changed files with 22 additions and 5540 deletions
|
@ -1,9 +0,0 @@
|
||||||
{ buildGoModule, tvix-src }:
|
|
||||||
buildGoModule rec {
|
|
||||||
pname = "nar-bridge-go";
|
|
||||||
version = "0.1.0";
|
|
||||||
src = tvix-src;
|
|
||||||
sourceRoot = "${src.name}/tvix/nar-bridge-go";
|
|
||||||
vendorHash = "sha256-7jugbC5sEGhppjiZgnoLP5A6kQSaHK9vE6cXVZBG22s=";
|
|
||||||
meta.mainProgram = "nar-bridge-http";
|
|
||||||
}
|
|
|
@ -1,6 +1,8 @@
|
||||||
final: _: {
|
final: _: {
|
||||||
tvix-store = final.callPackage ./tvix { packages = [ "tvix-store" ]; };
|
tvix = final.callPackage ./tvix {
|
||||||
nar-bridge = final.callPackage ./tvix { packages = [ "nar-bridge" ]; };
|
packages = [
|
||||||
nar-bridge-go = final.callPackage ./nar-bridge-go { };
|
"nar-bridge"
|
||||||
tvix-src = final.callPackage ./tvix-src.nix { };
|
"tvix-store"
|
||||||
|
];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
{ fetchgit }:
|
|
||||||
fetchgit {
|
|
||||||
name = "tvix";
|
|
||||||
url = "https://git.dgnum.eu/mdebray/tvl-depot.git";
|
|
||||||
rev = "2f767d0ddaa513da11f491b3b6dead22f795776b";
|
|
||||||
hash = "sha256-UYqyCc9uIckXMIp7iOzwy0COloM3o1FEwzo8ZALOw88=";
|
|
||||||
}
|
|
5513
pkgs/tvix/Cargo.lock
generated
5513
pkgs/tvix/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
tvix-src,
|
fetchgit,
|
||||||
rustPlatform,
|
rustPlatform,
|
||||||
protobuf,
|
protobuf,
|
||||||
packages ? [ ],
|
packages ? [ ],
|
||||||
|
@ -10,24 +10,33 @@ rustPlatform.buildRustPackage rec {
|
||||||
inherit pname;
|
inherit pname;
|
||||||
version = "0.1.0";
|
version = "0.1.0";
|
||||||
|
|
||||||
src = tvix-src;
|
src = fetchgit {
|
||||||
|
name = "tvix";
|
||||||
|
url = "https://cl.tvl.fyi/depot";
|
||||||
|
rev = "507a5c1b7376a2f9617b286f142ec8115cf19a6e";
|
||||||
|
hash = "sha256-QTAzM8b59NtQSjvlu5mcO13t4T58Mv00ax7/RnRENwk=";
|
||||||
|
};
|
||||||
|
|
||||||
patches = [ ];
|
patches = [ ];
|
||||||
postPatch = "cd tvix";
|
postPatch = "cd tvix";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
cargoBuildFlags = builtins.concatStringsSep " " (builtins.map (v: "-p ${v}") packages);
|
cargoBuildFlags = builtins.concatStringsSep " " (
|
||||||
|
builtins.map (v: "-p ${v}") packages
|
||||||
|
++ [
|
||||||
|
"--features"
|
||||||
|
"tvix-store/xp-store-composition"
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
nativeBuildInputs = [ protobuf ];
|
nativeBuildInputs = [ protobuf ];
|
||||||
|
|
||||||
PROTO_ROOT = "/build/${src.name}";
|
PROTO_ROOT = "/build/${src.name}";
|
||||||
|
|
||||||
cargoLock = {
|
cargoLock = {
|
||||||
lockFile = ./Cargo.lock;
|
lockFile = src + "/tvix/Cargo.lock";
|
||||||
outputHashes = {
|
allowBuiltinFetchGit = true;
|
||||||
"wu-manber-0.1.0" = "sha256-7YIttaQLfFC/32utojh2DyOHVsZiw8ul/z0lvOhAE/4=";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
meta = { };
|
meta = { };
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue