diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e776ef0d0c0f..cde1edad6a50 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5422,10 +5422,10 @@ githubId = 40234257; name = "ilkecan bozdogan"; }; - ihatethefrench = { + not-my-segfault = { email = "michal@tar.black"; matrix = "@michal:tar.black"; - github = "ihatethefrench"; + github = "not-my-segfault"; githubId = 30374463; name = "Michal S."; }; diff --git a/pkgs/development/compilers/kaitai-struct-compiler/default.nix b/pkgs/development/compilers/kaitai-struct-compiler/default.nix index 8561e7eae77e..7d34bb312cf4 100644 --- a/pkgs/development/compilers/kaitai-struct-compiler/default.nix +++ b/pkgs/development/compilers/kaitai-struct-compiler/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "kaitai-struct-compiler"; - version = "0.9"; + version = "0.10"; src = fetchzip { url = "https://github.com/kaitai-io/kaitai_struct_compiler/releases/download/${version}/kaitai-struct-compiler-${version}.zip"; - sha256 = "sha256-2HSasigpJDuWNejNVklnpQwaA4MC030S9taF/7YvzgY="; + sha256 = "sha256-oY1OiEq619kLmQPMRQ4sjuBnTXgJ2WfvsEj1JrxUGPA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index e13143f88e61..f7e9fd75855f 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { pname = "griffe"; - version = "0.21.0"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonApplication rec { owner = "mkdocstrings"; repo = pname; rev = version; - hash = "sha256-yhhEcPwh1AjMtDlPZVDR69WX/728wuKqdJdc+yv/o4c="; + hash = "sha256-GqPXVi+SsfO0ufUJzEZ5eUzwJmM/wylLA1KMv+WaIsU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/kaitaistruct/default.nix b/pkgs/development/python-modules/kaitaistruct/default.nix index 714f51c0d3da..c82f2b4c04b9 100644 --- a/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/pkgs/development/python-modules/kaitaistruct/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fetchFromGitHub +, brotli , lz4 }: @@ -9,25 +10,26 @@ let kaitai_compress = fetchFromGitHub { owner = "kaitai-io"; repo = "kaitai_compress"; - rev = "434fb42220ff58778bb9fbadb6152cad7e4f5dd0"; - sha256 = "zVnkVl3amUDOB+pnw5SkMGSrVL/dTQ82E8IWfJvKC4Q="; + rev = "12f4cffb45d95b17033ee4f6679987656c6719cc"; + sha256 = "sha256-l3rGbblUgxO6Y7grlsMEiT3nRIgUZV1VqTyjIgIDtyA="; }; in buildPythonPackage rec { pname = "kaitaistruct"; - version = "0.9"; + version = "0.10"; src = fetchPypi { inherit pname version; - sha256 = "3d5845817ec8a4d5504379cc11bd570b038850ee49c4580bc0998c8fb1d327ad"; + sha256 = "sha256-oETe4pFz1q+6zye8rDna+JtlTdQYz6AJq4LZF4qa5So="; }; preBuild = '' ln -s ${kaitai_compress}/python/kaitai kaitai - sed '28ipackages = kaitai/compress' -i setup.cfg + sed '32ipackages = kaitai/compress' -i setup.cfg ''; propagatedBuildInputs = [ + brotli lz4 ]; diff --git a/pkgs/development/tools/sshs/default.nix b/pkgs/development/tools/sshs/default.nix index 389afed5e279..cd999ed39a9d 100644 --- a/pkgs/development/tools/sshs/default.nix +++ b/pkgs/development/tools/sshs/default.nix @@ -27,6 +27,6 @@ buildGoModule rec { description = "Terminal user interface for SSH"; homepage = "https://github.com/quantumsheep/sshs"; license = licenses.mit; - maintainers = with maintainers; [ ihatethefrench ]; + maintainers = with maintainers; [ not-my-segfault ]; }; } diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 084c6583212e..788e4c4b0b2a 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -17,13 +17,13 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; - version = "3.2.3"; + version = "3.2.6"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-mMTZKlGVjFPGJI4Ky+V3lPuMYS7tJb+zeDEzMeXdGoU="; + sha256 = "sha256-VJicqA/zH0VN3uoYpH1DPNvPTF2ABZeIcrLGCPlmtPQ="; }; format = "other"; @@ -35,6 +35,7 @@ py.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with py.pkgs; [ + bleach django_4 django-cors-headers django-debug-toolbar @@ -55,11 +56,11 @@ py.pkgs.buildPythonApplication rec { jinja2 markdown markdown-include - mkdocs-material netaddr pillow psycopg2 pyyaml + sentry-sdk social-auth-core social-auth-app-django svgwrite @@ -67,6 +68,22 @@ py.pkgs.buildPythonApplication rec { jsonschema ] ++ extraBuildInputs; + buildInputs = with py.pkgs; [ + mkdocs-material + mkdocs-material-extensions + mkdocstrings + mkdocstrings-python + ]; + + nativeBuildInputs = [ + py.pkgs.mkdocs + ]; + + postBuild = '' + PYTHONPATH=$PYTHONPATH:netbox/ + python -m mkdocs build + ''; + installPhase = '' mkdir -p $out/opt/netbox cp -r . $out/opt/netbox