d4b00046d3
- Introduce explicit CLI layer model (os-packages, nix, python, makefile) and central InstallationPipeline to orchestrate installers. - Move installer orchestration out of install_repos() into pkgmgr.actions.repository.install.pipeline, using layer precedence and capability tracking. - Add pkgmgr.actions.repository.install.layers to classify commands into layers and compare priorities. - Rework PythonInstaller to always use isolated environments: PKGMGR_PIP override → active venv → per-repo venv under ~/.venvs/<identifier>, avoiding system Python and PEP 668 conflicts. - Adjust NixFlakeInstaller to install flake outputs based on repository identity: pkgmgr/package-manager → pkgmgr (mandatory) + default (optional), all other repos → default (mandatory). - Tighten MakefileInstaller behaviour, add global PKGMGR_DISABLE_MAKEFILE_INSTALLER switch, and simplify install target detection. - Rewrite resolve_command_for_repo() with explicit Repository typing, better Python package detection, Nix/PATH resolution, and a library-only fallback instead of raising on missing CLI. - Update flake.nix devShell to provide python3 with pip and add pip as a propagated build input. - Remove deprecated/wip repository entries from config defaults and drop the unused config/wip.yml. https://chatgpt.com/share/69399157-86d8-800f-9935-1a820893e908
114 lines
3.0 KiB
Nix
114 lines
3.0 KiB
Nix
{
|
|
description = "Nix flake for Kevin's package-manager tool";
|
|
|
|
nixConfig = {
|
|
extra-experimental-features = [ "nix-command" "flakes" ];
|
|
};
|
|
|
|
inputs = {
|
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
|
};
|
|
|
|
outputs = { self, nixpkgs }:
|
|
let
|
|
systems = [ "x86_64-linux" "aarch64-linux" ];
|
|
|
|
forAllSystems = f:
|
|
builtins.listToAttrs (map (system: {
|
|
name = system;
|
|
value = f system;
|
|
}) systems);
|
|
in
|
|
{
|
|
##########################################################################
|
|
# PACKAGES
|
|
##########################################################################
|
|
packages = forAllSystems (system:
|
|
let
|
|
pkgs = nixpkgs.legacyPackages.${system};
|
|
pyPkgs = pkgs.python311Packages;
|
|
in
|
|
rec {
|
|
pkgmgr = pyPkgs.buildPythonApplication {
|
|
pname = "package-manager";
|
|
version = "0.7.14";
|
|
|
|
# Use the git repo as source
|
|
src = ./.;
|
|
|
|
# Build using pyproject.toml
|
|
format = "pyproject";
|
|
|
|
# Build backend requirements from [build-system]
|
|
nativeBuildInputs = [
|
|
pyPkgs.setuptools
|
|
pyPkgs.wheel
|
|
];
|
|
|
|
# Runtime dependencies (matches [project.dependencies])
|
|
propagatedBuildInputs = [
|
|
pyPkgs.pyyaml
|
|
pyPkgs.pip
|
|
];
|
|
|
|
doCheck = false;
|
|
|
|
pythonImportsCheck = [ "pkgmgr" ];
|
|
};
|
|
default = pkgmgr;
|
|
}
|
|
);
|
|
|
|
##########################################################################
|
|
# DEVELOPMENT SHELL
|
|
##########################################################################
|
|
devShells = forAllSystems (system:
|
|
let
|
|
pkgs = nixpkgs.legacyPackages.${system};
|
|
pkgmgrPkg = self.packages.${system}.pkgmgr;
|
|
|
|
ansiblePkg =
|
|
if pkgs ? ansible-core then pkgs.ansible-core
|
|
else pkgs.ansible;
|
|
|
|
# Python 3 + pip für alles, was "python3 -m pip" macht
|
|
pythonWithPip = pkgs.python3.withPackages (ps: [
|
|
ps.pip
|
|
]);
|
|
in
|
|
{
|
|
default = pkgs.mkShell {
|
|
buildInputs = [
|
|
pythonWithPip
|
|
pkgmgrPkg
|
|
pkgs.git
|
|
ansiblePkg
|
|
];
|
|
|
|
shellHook = ''
|
|
echo "Entered pkgmgr development shell for ${system}"
|
|
echo "pkgmgr CLI is available via the flake build"
|
|
'';
|
|
};
|
|
}
|
|
);
|
|
|
|
##########################################################################
|
|
# nix run .#pkgmgr
|
|
##########################################################################
|
|
apps = forAllSystems (system:
|
|
let
|
|
pkgmgrPkg = self.packages.${system}.pkgmgr;
|
|
in
|
|
{
|
|
pkgmgr = {
|
|
type = "app";
|
|
program = "${pkgmgrPkg}/bin/pkgmgr";
|
|
};
|
|
|
|
default = self.apps.${system}.pkgmgr;
|
|
}
|
|
);
|
|
};
|
|
}
|