nix: resolve buildbot extension from buildbot python set
This commit is contained in:
parent
9275d2cc8a
commit
20338484cc
2 changed files with 43 additions and 41 deletions
42
flake.nix
42
flake.nix
|
|
@ -48,8 +48,28 @@
|
|||
nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ final.setuptools ];
|
||||
});
|
||||
};
|
||||
mkBuildbotExtPythonSet =
|
||||
pkgs: python:
|
||||
(pkgs.callPackage pyproject-nix.build.packages {
|
||||
inherit python;
|
||||
}).overrideScope
|
||||
(
|
||||
pkgs.lib.composeManyExtensions [
|
||||
pyproject-build-systems.overlays.default
|
||||
buildbotExtOverlay
|
||||
pyprojectOverrides
|
||||
]
|
||||
);
|
||||
mkBuildbotAutoscaleExtPythonPackagesExtension = pkgs: pyFinal: _pyPrev: {
|
||||
buildbot-autoscale-ext =
|
||||
pyFinal.toPythonModule (mkBuildbotExtPythonSet pkgs pyFinal.python)."buildbot-autoscale-ext";
|
||||
};
|
||||
in
|
||||
{
|
||||
lib = {
|
||||
inherit mkBuildbotAutoscaleExtPythonPackagesExtension;
|
||||
};
|
||||
|
||||
formatter = forAllSystems (
|
||||
pkgs: (treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build.wrapper
|
||||
);
|
||||
|
|
@ -75,16 +95,7 @@
|
|||
]
|
||||
);
|
||||
buildbotExtPythonSet =
|
||||
(pkgs.callPackage pyproject-nix.build.packages {
|
||||
python = pkgs.python3;
|
||||
}).overrideScope
|
||||
(
|
||||
pkgs.lib.composeManyExtensions [
|
||||
pyproject-build-systems.overlays.default
|
||||
buildbotExtOverlay
|
||||
pyprojectOverrides
|
||||
]
|
||||
);
|
||||
mkBuildbotExtPythonSet pkgs pkgs.python3;
|
||||
venv = agentPythonSet.mkVirtualEnv "nix-builder-autoscaler-env" agentWorkspace.deps.default;
|
||||
buildbotExtVenv = buildbotExtPythonSet.mkVirtualEnv "buildbot-autoscale-ext-env" buildbotExtWorkspace.deps.default;
|
||||
in
|
||||
|
|
@ -135,16 +146,7 @@
|
|||
]
|
||||
);
|
||||
buildbotExtPythonSet =
|
||||
(pkgs.callPackage pyproject-nix.build.packages {
|
||||
python = pkgs.python3;
|
||||
}).overrideScope
|
||||
(
|
||||
pkgs.lib.composeManyExtensions [
|
||||
pyproject-build-systems.overlays.default
|
||||
buildbotExtOverlay
|
||||
pyprojectOverrides
|
||||
]
|
||||
);
|
||||
mkBuildbotExtPythonSet pkgs pkgs.python3;
|
||||
testVenv = agentPythonSet.mkVirtualEnv "nix-builder-autoscaler-test-env" {
|
||||
nix-builder-autoscaler = [ "dev" ];
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue