Nebucatnetzer
/
network_inventory
mirror of https://github.com/Nebucatnetzer/network_inventory.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rewrite the flake to use poetry2nix.dependencyEnv

This commit is contained in:
Andreas Zweili 2022-12-12 20:37:51 +01:00
parent b1f2125e55
commit a529a59e29
3 changed files with 30 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
flake.nix
View File

@ -13,16 +13,17 @@
{ {
overlays.default = nixpkgs.lib.composeManyExtensions [ overlays.default = nixpkgs.lib.composeManyExtensions [
poetry2nix.overlay poetry2nix.overlay
(final: prev: { (final: prev: rec {
inventoryDevEnv = prev.poetry2nix.mkPoetryEnv inventoryDevEnv = prev.poetry2nix.mkPoetryEnv
{ {
projectDir = ./.; projectDir = ./.;
groups = [ "main" "dev" ]; groups = [ "main" "dev" ];
}; };
inventoryEnv = prev.poetry2nix.mkPoetryEnv { inventoryPackage = prev.poetry2nix.mkPoetryApplication {
projectDir = ./.; projectDir = ./.;
groups = [ "main" ]; groups = [ "main" ];
}; };
inventoryEnv = inventoryPackage.dependencyEnv;
}) })
]; ];
} // (flake-utils.lib.eachDefaultSystem (system: } // (flake-utils.lib.eachDefaultSystem (system:
@ -31,41 +32,8 @@
inherit system; inherit system;
overlays = [ self.overlays.default ]; overlays = [ self.overlays.default ];
}; };
src = with pkgs.lib;
cleanSource (cleanSourceWith {
filter = name: type:
let
baseName = baseNameOf (toString name);
in
!(builtins.elem baseName [
".coverage"
".coveragerc"
".dir-locals.el"
".direnv"
".git"
".github"
".env"
".envrc"
".flake8"
".gitignore"
".gitlab-ci.yml"
"conftest.py"
"docker-compose.yaml"
"flake.lock"
"flake.nix"
"Makefile"
"poetry.lock"
"poetry.toml"
"pyproject.toml"
"pytest.ini"
"__pycache__"
"*.pyc"
"tests"
]);
src = ./.;
});
inventory = pkgs.stdenv.mkDerivation { inventory = pkgs.stdenv.mkDerivation {
inherit src; src = ./.;
version = "latest"; version = "latest";
pname = "network-inventory"; pname = "network-inventory";
installPhase = '' installPhase = ''
@ -131,37 +99,36 @@
paths = [ paths = [
pkgs.bashInteractive pkgs.bashInteractive
pkgs.coreutils pkgs.coreutils
pkgs.inventoryEnv
inventory inventory
(pkgs.writeShellScriptBin "start-inventory" '' (pkgs.writeShellScriptBin "start-inventory" ''
if [ -f .second_run ]; then if [ -f .second_run ]; then
sleep 2 sleep 2
${pkgs.python3}/bin/python manage.py collectstatic --noinput ${pkgs.inventoryEnv}/bin/django-admin collectstatic --noinput
${pkgs.python3}/bin/python manage.py makemigrations ${pkgs.inventoryEnv}/bin/django-admin makemigrations
${pkgs.python3}/bin/python manage.py migrate ${pkgs.inventoryEnv}/bin/django-admin migrate
else else
${pkgs.python3}/bin/python manage.py collectstatic --noinput ${pkgs.inventoryEnv}/bin/django-admin collectstatic --noinput
${pkgs.python3}/bin/python manage.py makemigrations backups ${pkgs.inventoryEnv}/bin/django-admin makemigrations backups
${pkgs.python3}/bin/python manage.py makemigrations computers ${pkgs.inventoryEnv}/bin/django-admin makemigrations computers
${pkgs.python3}/bin/python manage.py makemigrations core ${pkgs.inventoryEnv}/bin/django-admin makemigrations core
${pkgs.python3}/bin/python manage.py makemigrations customers ${pkgs.inventoryEnv}/bin/django-admin makemigrations customers
${pkgs.python3}/bin/python manage.py makemigrations devices ${pkgs.inventoryEnv}/bin/django-admin makemigrations devices
${pkgs.python3}/bin/python manage.py makemigrations licenses ${pkgs.inventoryEnv}/bin/django-admin makemigrations licenses
${pkgs.python3}/bin/python manage.py makemigrations nets ${pkgs.inventoryEnv}/bin/django-admin makemigrations nets
${pkgs.python3}/bin/python manage.py makemigrations softwares ${pkgs.inventoryEnv}/bin/django-admin makemigrations softwares
${pkgs.python3}/bin/python manage.py makemigrations users ${pkgs.inventoryEnv}/bin/django-admin makemigrations users
${pkgs.python3}/bin/python manage.py makemigrations ${pkgs.inventoryEnv}/bin/django-admin makemigrations
${pkgs.python3}/bin/python manage.py migrate ${pkgs.inventoryEnv}/bin/django-admin migrate
${pkgs.python3}/bin/python manage.py loaddata backups ${pkgs.inventoryEnv}/bin/django-admin loaddata backups
${pkgs.python3}/bin/python manage.py loaddata computers ${pkgs.inventoryEnv}/bin/django-admin loaddata computers
${pkgs.python3}/bin/python manage.py loaddata core ${pkgs.inventoryEnv}/bin/django-admin loaddata core
${pkgs.python3}/bin/python manage.py loaddata devices ${pkgs.inventoryEnv}/bin/django-admin loaddata devices
${pkgs.python3}/bin/python manage.py loaddata nets ${pkgs.inventoryEnv}/bin/django-admin loaddata nets
${pkgs.python3}/bin/python manage.py loaddata softwares ${pkgs.inventoryEnv}/bin/django-admin loaddata softwares
${pkgs.python3}/bin/python manage.py shell -c "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', 'admin@example.com', 'password')" ${pkgs.inventoryEnv}/bin/django-admin shell -c "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', 'admin@example.com', 'password')"
touch .second_run touch .second_run
fi fi
${pkgs.python310Packages.gunicorn}/bin/gunicorn network_inventory.wsgi:application --reload --bind 0.0.0.0:8000 --workers 3 ${pkgs.inventoryEnv}/bin/gunicorn network_inventory.wsgi:application --reload --bind 0.0.0.0:8000 --workers 3
'') '')
]; ];
}; };
@ -171,7 +138,7 @@
Env = [ Env = [
"POSTGRES_DB=network_inventory" "POSTGRES_DB=network_inventory"
"DJANGO_SETTINGS_MODULE=network_inventory.settings.production" "DJANGO_SETTINGS_MODULE=network_inventory.settings.production"
"PYTHONPATH=/lib/python3.10:/lib/python3.10/site-packages" "PYTHONPATH=/lib/python3.10:/lib/python3.10/site-packages:/code"
]; ];
}; };
}; };

2
poetry.lock generated
View File

@ -722,7 +722,7 @@ python-versions = "*"
[metadata] [metadata]
lock-version = "1.1" lock-version = "1.1"
python-versions = "^3.9" python-versions = "^3.9"
content-hash = "497467f8cce845c8f08bbbdc259f9faaf212af95639356eff39ad0240a0f22b6" content-hash = "6c310d4f7398036e0ce6ab320014b9aa2bf4b7dc187503ae2b4962995b3eab3b"
[metadata.files] [metadata.files]
appdirs = [ appdirs = [

1
pyproject.toml
View File

@ -22,6 +22,7 @@ django-htmx = "^1.13.0"
django-model-utils = "^4.2.0" django-model-utils = "^4.2.0"
django-nested-admin = "^4.0.2" django-nested-admin = "^4.0.2"
django-tables2 = "^2.4.1" django-tables2 = "^2.4.1"
gunicorn = "^20.1.0"
psycopg2-binary = "^2.9.5" psycopg2-binary = "^2.9.5"
PyYAML = "^6.0" PyYAML = "^6.0"