Rewrite to use both poetryEnv and poetryApplication

This commit is contained in:
Andreas Zweili 2022-11-24 18:14:04 +01:00
parent 0a0fc61ec5
commit 017ba22625
1 changed files with 26 additions and 32 deletions

View File

@ -14,36 +14,30 @@
overlay = nixpkgs.lib.composeManyExtensions [ overlay = nixpkgs.lib.composeManyExtensions [
poetry2nix.overlay poetry2nix.overlay
(final: prev: { (final: prev: {
inventoryEnv = prev.poetry2nix.mkPoetryEnv inventoryEnv = prev.poetry2nix.mkPoetryEnv {
{ projectDir = ./.;
projectDir = ./.; overrides = prev.poetry2nix.defaultPoetryOverrides.extend
overrides = prev.poetry2nix.defaultPoetryOverrides.extend (self: super: {
(self: super: { python-monkey-business = super.python-monkey-business.overridePythonAttrs
python-monkey-business = super.python-monkey-business.overridePythonAttrs (
( old: {
old: { buildInputs = (old.buildInputs or [ ]) ++ [ super.setuptools ];
buildInputs = (old.buildInputs or [ ]) ++ [ super.setuptools ]; }
} );
); });
}); };
}; inventoryPackage = prev.poetry2nix.mkPoetryApplication {
}) projectDir = ./.;
poetry2nix.overlay overrides = prev.poetry2nix.defaultPoetryOverrides.extend
(final: prev: { (self: super: {
inventory = prev.poetry2nix.mkPoetryApplication python-monkey-business = super.python-monkey-business.overridePythonAttrs
{ (
projectDir = ./.; old: {
checkPhase = "pytest --ds=network_inventory.settings.ram_test -nauto --nomigrations"; buildInputs = (old.buildInputs or [ ]) ++ [ super.setuptools ];
overrides = prev.poetry2nix.defaultPoetryOverrides.extend }
(self: super: { );
python-monkey-business = super.python-monkey-business.overridePythonAttrs });
( };
old: {
buildInputs = (old.buildInputs or [ ]) ++ [ super.setuptools ];
}
);
});
};
}) })
]; ];
} // (flake-utils.lib.eachDefaultSystem (system: } // (flake-utils.lib.eachDefaultSystem (system:
@ -66,7 +60,7 @@
''; '';
}; };
packages.venv = pkgs.inventoryEnv; packages.venv = pkgs.inventoryEnv;
packages.inventory = pkgs.inventory; packages.inventory = pkgs.inventoryPackage;
packages.default = pkgs.inventory; packages.default = pkgs.inventoryPackage;
})); }));
} }