diff --git a/home/modules/development.nix b/home/modules/development.nix index d2c918b..0fac525 100644 --- a/home/modules/development.nix +++ b/home/modules/development.nix @@ -10,7 +10,9 @@ let bruno-cli cargo gh-copilot - mariadb + gnumake + libcap.dev + libmysqlclient.dev nix-eval-jobs nix-fast-build nix-output-monitor diff --git a/overlays/default.nix b/overlays/default.nix index 0edcff7..bd7fe60 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -4,6 +4,7 @@ let myPackages = pypackages: with pypackages; [ black + build dateutil ipython mypy @@ -11,6 +12,7 @@ let pyyaml responses ruamel-yaml + setuptools tox typing-extensions virtualenv diff --git a/overlays/pipenv.nix b/overlays/pipenv.nix index ea06e4c..f04e373 100644 --- a/overlays/pipenv.nix +++ b/overlays/pipenv.nix @@ -6,8 +6,6 @@ installShellFiles, }: -with python3.pkgs; - let runtimeDeps = @@ -15,8 +13,11 @@ let with ps; [ certifi + pysocks setuptools - pip + (pip.overridePythonAttrs { + dependencies = [ ps.pysocks ]; + }) virtualenv virtualenv-clone ] @@ -25,7 +26,7 @@ let pythonEnv = python3.withPackages runtimeDeps; in -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "pipenv"; version = "2023.11.15"; format = "pyproject"; @@ -39,7 +40,7 @@ buildPythonApplication rec { env.LC_ALL = "en_US.UTF-8"; - nativeBuildInputs = [ + nativeBuildInputs = with python3.pkgs; [ installShellFiles setuptools wheel @@ -60,7 +61,7 @@ buildPythonApplication rec { export HOME="$TMPDIR" ''; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ mock pytestCheckHook pytest-xdist