From 035c191ae12d614e83b52a0cc813c5703dd35efe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Jul 2022 09:17:54 +0000 Subject: [PATCH 1/7] netbox: 3.2.3 -> 3.2.6 --- pkgs/servers/web-apps/netbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 084c6583212e..301bb7c02554 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"; From bcd9dc120e5c7377bb46e77143ffa121d08a9f5f Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 17 Jul 2022 14:59:54 +0000 Subject: [PATCH 2/7] griffe: 0.21.0 -> 0.22.0 --- pkgs/development/python-modules/griffe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From db93e37fa34fe839f468d9a8754e1fd0c843450a Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 17 Jul 2022 15:00:05 +0000 Subject: [PATCH 3/7] netbox: add new dependencies (bleach, sentry-sdk) --- pkgs/servers/web-apps/netbox/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 301bb7c02554..9d60efe94460 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -35,6 +35,7 @@ py.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with py.pkgs; [ + bleach django_4 django-cors-headers django-debug-toolbar @@ -60,6 +61,7 @@ py.pkgs.buildPythonApplication rec { pillow psycopg2 pyyaml + sentry-sdk social-auth-core social-auth-app-django svgwrite From d5eb8cea6163e268dc380ba03dbbf55cff211f1c Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 17 Jul 2022 15:00:40 +0000 Subject: [PATCH 4/7] netbox: build documentation as part of build --- pkgs/servers/web-apps/netbox/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 9d60efe94460..788e4c4b0b2a 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -56,7 +56,6 @@ py.pkgs.buildPythonApplication rec { jinja2 markdown markdown-include - mkdocs-material netaddr pillow psycopg2 @@ -69,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 From 443ce157a86a85b82f11050b0b5fad97551b217a Mon Sep 17 00:00:00 2001 From: Michal Date: Thu, 21 Jul 2022 23:22:27 +0100 Subject: [PATCH 5/7] maintainers: ihatethefrench -> not-my-segfault --- maintainers/maintainer-list.nix | 4 ++-- pkgs/development/tools/sshs/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 69700f081622..017265b9ad42 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5393,10 +5393,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/tools/sshs/default.nix b/pkgs/development/tools/sshs/default.nix index 76cd63876ad8..af06bc9acadb 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 ]; }; } From f0fd10edeace908bd5c299b4128a0f6e48dc41ea Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 19 Jul 2022 15:35:27 -0700 Subject: [PATCH 6/7] pythonPackages.kaitaistruct: 0.9 -> 0.10 --- .../python-modules/kaitaistruct/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 ]; From 62ab1e3d0b65ea630245545c8b289cec32c2dab3 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Tue, 19 Jul 2022 15:42:19 -0700 Subject: [PATCH 7/7] kaitai-struct-compiler: 0.9 -> 0.10 --- pkgs/development/compilers/kaitai-struct-compiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ];