From 724b5fb759e95331e39fed1c562988eb57cb533e Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Tue, 1 Mar 2022 09:56:58 +0100 Subject: [PATCH] WIP shell --- flake.nix | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/flake.nix b/flake.nix index 9fb0fdc..a24d893 100644 --- a/flake.nix +++ b/flake.nix @@ -15,25 +15,31 @@ let pkgs = nixpkgs.legacyPackages.${system}; machNix = mach-nix.lib."${system}"; - local_requirements = builtins.readFile ./requirements/local.txt; + devEnvironment = machNix.mkPython { + requirements = builtins.readFile ./requirements/local.txt; + _.pytest-cov.propagatedBuildInputs.mod = pySelf: self: oldVal: oldVal ++ [ pySelf.tomli ]; + }; in { - devShell = machNix.mkPythonShell { - packagesExtra = with pkgs; [ pkgs.gnumake ]; - requirements = local_requirements; - _.pytest-cov.propagatedBuildInputs.mod = pySelf: self: oldVal: oldVal ++ [ pySelf.tomli ]; - }; - packages.venv = machNix.mkPython { - requirements = local_requirements; - _.pytest-cov.propagatedBuildInputs.mod = pySelf: self: oldVal: oldVal ++ [ pySelf.tomli ]; + devShell = pkgs.mkShell { + buildInputs = [ + devEnvironment + pkgs.gnumake + ]; + shellHook = '' + export DJANGO_SETTINGS_MODULE=network_inventory.settings.local + ''; }; + packages.venv = devEnvironment; defaultPackage = (machNix.mkDockerImage { - packagesExtra = with pkgs; [ pkgs.bash ]; + packagesExtra = with pkgs; + [ pkgs.bash ]; requirements = builtins.readFile ./requirements/docker.txt; _.pytest-cov.propagatedBuildInputs.mod = pySelf: self: oldVal: oldVal ++ [ pySelf.tomli ]; - }).override (oldAttrs: { - name = "network-inventory"; - config.Cmd = [ "run.sh" ]; - }); + }).override + (oldAttrs: { + name = "network-inventory"; + config.Cmd = [ "run.sh" ]; + }); }); }