diff --git a/nix/pkgs/netbox/default.nix b/nix/pkgs/netbox/default.nix index ff08e26091..38d9ed2072 100644 --- a/nix/pkgs/netbox/default.nix +++ b/nix/pkgs/netbox/default.nix @@ -22,7 +22,8 @@ buildPythonApplication rec { }; propagatedBuildInputs = (with deps; [ - Django + bleach + django django-cors-headers django-debug-toolbar django-filter @@ -43,12 +44,18 @@ buildPythonApplication rec { Markdown markdown-include mkdocs-material + mkdocstrings + mkdocstrings-python-legacy netaddr pillow - pycryptodome PyYAML + sentry-sdk + social-auth-app-django + social-auth-core svgwrite tablib + tzdata + jsonschema django-storages ]) ++ [ @@ -86,7 +93,7 @@ buildPythonApplication rec { EOF chmod +x $out/bin/netbox-gunicorn - cp $out/share/netbox/netbox/netbox/configuration.testing.py $out/share/netbox/netbox/netbox/configuration.py + cp $out/share/netbox/netbox/netbox/configuration_testing.py $out/share/netbox/netbox/netbox/configuration.py PYTHONPATH=$PYDIR/site-packages:$PYTHONPATH python $out/bin/netbox-manage collectstatic --no-input cp $configurationPath $out/share/netbox/netbox/netbox/configuration.py diff --git a/nix/pkgs/netbox/python-packages.nix b/nix/pkgs/netbox/python-packages.nix index 1dfc0cdaea..fce8cdec82 100644 --- a/nix/pkgs/netbox/python-packages.nix +++ b/nix/pkgs/netbox/python-packages.nix @@ -4,7 +4,8 @@ { pkgs, fetchurl, fetchgit, fetchhg }: self: super: { - "Django" = super.buildPythonPackage rec { + "Django" = self.django; + "django" = super.buildPythonPackage rec { pname = "Django"; version = "4.0.5"; src = fetchurl { @@ -151,20 +152,6 @@ self: super: { nativeBuildInputs = []; propagatedBuildInputs = []; }; - "attrs" = super.buildPythonPackage rec { - pname = "attrs"; - version = "21.4.0"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/be/be/7abce643bfdf8ca01c48afa2ddf8308c2308b0c3b239a44e57d020afa0ef/attrs-21.4.0-py2.py3-none-any.whl"; - sha256 = "1d185347kgm169c8fs1i8rmcvv65hx4fj7w5mcv5smks9mwf69rd"; - }; - format = "wheel"; - doCheck = false; - buildInputs = []; - checkInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = []; - }; "bleach" = super.buildPythonPackage rec { pname = "bleach"; version = "5.0.0"; @@ -196,22 +183,6 @@ self: super: { nativeBuildInputs = []; propagatedBuildInputs = []; }; - "cffi" = super.buildPythonPackage rec { - pname = "cffi"; - version = "1.15.0"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/00/9e/92de7e1217ccc3d5f352ba21e52398372525765b2e0c4530e6eb2ba9282a/cffi-1.15.0.tar.gz"; - sha256 = "0m3rz2pqfmyfagx0bhj2jlbr2h58j3wr3cyv1agxkhlnm1k0s3wj"; - }; - format = "setuptools"; - doCheck = false; - buildInputs = []; - checkInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = [ - self."pycparser" - ]; - }; "charset-normalizer" = super.buildPythonPackage rec { pname = "charset-normalizer"; version = "2.0.12"; @@ -275,22 +246,6 @@ self: super: { self."Jinja2" ]; }; - "cryptography" = super.buildPythonPackage rec { - pname = "cryptography"; - version = "37.0.2"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/51/05/bb2b681f6a77276fc423d04187c39dafdb65b799c8d87b62ca82659f9ead/cryptography-37.0.2.tar.gz"; - sha256 = "13n6nmagsrj025w2ybva75bzlgi6s83p01s9ixbagkn97hjss97j"; - }; - format = "setuptools"; - doCheck = false; - buildInputs = []; - checkInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = [ - self."cffi" - ]; - }; "defusedxml" = super.buildPythonPackage rec { pname = "defusedxml"; version = "0.7.1"; @@ -887,7 +842,7 @@ self: super: { self."MarkupSafe" self."mkdocs" self."mkdocs-autorefs" - self."mkdocstrings-python-legacy" + #self."mkdocstrings-python-legacy" self."pymdown-extensions" ]; }; @@ -936,22 +891,6 @@ self: super: { nativeBuildInputs = []; propagatedBuildInputs = []; }; - "packaging" = super.buildPythonPackage rec { - pname = "packaging"; - version = "21.3"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/05/8e/8de486cbd03baba4deef4142bd643a3e7bbe954a784dc1bb17142572d127/packaging-21.3-py3-none-any.whl"; - sha256 = "08nmbgmf38nnxr99d5nlnacrr2jh1wp4xsi4ms1wgk8ryl2kw47g"; - }; - format = "wheel"; - doCheck = false; - buildInputs = []; - checkInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = [ - self."pyparsing" - ]; - }; "prometheus-client" = super.buildPythonPackage rec { pname = "prometheus-client"; version = "0.14.1"; @@ -996,34 +935,6 @@ self: super: { nativeBuildInputs = []; propagatedBuildInputs = []; }; - "pycparser" = super.buildPythonPackage rec { - pname = "pycparser"; - version = "2.21"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/62/d5/5f610ebe421e85889f2e55e33b7f9a6795bd982198517d912eb1c76e1a53/pycparser-2.21-py2.py3-none-any.whl"; - sha256 = "1agwca0hgbpwmr9snhxafqjhfd52mq083rw5n7vf25amallm9r4f"; - }; - format = "wheel"; - doCheck = false; - buildInputs = []; - checkInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = []; - }; - "pygments" = super.buildPythonPackage rec { - pname = "pygments"; - version = "2.12.0"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/5c/8e/1d9017950034297fffa336c72e693a5b51bbf85141b24a763882cf1977b5/Pygments-2.12.0-py3-none-any.whl"; - sha256 = "06f5262329mjp18yl70gjha8816j1k78ws2cxpv60hll83xi176w"; - }; - format = "wheel"; - doCheck = false; - buildInputs = []; - checkInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = []; - }; "pymdown-extensions" = super.buildPythonPackage rec { pname = "pymdown-extensions"; version = "9.5"; @@ -1040,20 +951,6 @@ self: super: { self."Markdown" ]; }; - "pyparsing" = super.buildPythonPackage rec { - pname = "pyparsing"; - version = "3.0.9"; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/6c/10/a7d0fa5baea8fe7b50f448ab742f26f52b80bfca85ac2be9d35cdd9a3246/pyparsing-3.0.9-py3-none-any.whl"; - sha256 = "1g3b426kswh9ndjdlkpf9ba0fhwz5c2hjbxb3nvfzshfl7lvl9jh"; - }; - format = "wheel"; - doCheck = false; - buildInputs = []; - checkInputs = []; - nativeBuildInputs = []; - propagatedBuildInputs = []; - }; "pyrsistent" = super.buildPythonPackage rec { pname = "pyrsistent"; version = "0.18.1";