netbox: 3.4.10 -> 3.5.0

NixOS · Apr 29, 2023 · 0c97d30 · 0c97d30
1 parent aa4d05b
commit 0c97d30
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md
@@ -284,7 +284,7 @@ In addition to numerous new and upgraded packages, this release has the followin
   - `services.openssh.ciphers` to `services.openssh.settings.Ciphers`
   - `services.openssh.gatewayPorts` to `services.openssh.settings.GatewayPorts`
 
-- `netbox` was updated to 3.4. NixOS' `services.netbox.package` still defaults to 3.3 if `stateVersion` is earlier than 23.05. Please review upstream's [breaking changes](https://github.com/netbox-community/netbox/releases/tag/v3.4.0), and upgrade NetBox by changing `services.netbox.package`. Database migrations will be run automatically.
+- `netbox` was updated to 3.5. NixOS' `services.netbox.package` still defaults to 3.3 if `stateVersion` is earlier than 23.05. Please review upstream's breaking changes [for 3.4.0](https://github.com/netbox-community/netbox/releases/tag/v3.4.0) and [for 3.5.0](https://github.com/netbox-community/netbox/releases/tag/v3.5.0), and upgrade NetBox by changing `services.netbox.package`. Database migrations will be run automatically.
 
 - `services.netbox` now support RFC42-style options, through `services.netbox.settings`.
 

diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix
@@ -23,8 +23,8 @@ in
   };
 
   netbox = callPackage generic {
-    version = "3.4.10";
-    hash = "sha256-STNukh/UYAiZ5amLfpmzIcv8OlRqW0zU+66ShfDiGkc=";
+    version = "3.5.0";
+    hash = "sha256-LsUitX/e+ec/9mRBw+cbGOG2Idl9ZQwf/vxIC3YS5LU=";
     extraPatches = [
       # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL
       ./config.patch

diff --git a/pkgs/servers/web-apps/netbox/generic.nix b/pkgs/servers/web-apps/netbox/generic.nix
@@ -1,5 +1,6 @@
 { lib
 , fetchFromGitHub
+, fetchpatch
 , python3
 , version
 , hash
@@ -13,6 +14,23 @@
     py = python3 // {
       pkgs = python3.pkgs.overrideScope (self: super: {
         django = super.django_4;
+        drf-nested-routers = super.drf-nested-routers.overridePythonAttrs (_oldAttrs: {
+          patches = [
+            # all for django 4 compat
+            (fetchpatch {
+              url = "https://github.com/alanjds/drf-nested-routers/commit/59764cc356f7f593422b26845a9dfac0ad196120.diff";
+              hash = "sha256-mq3vLHzQlGl2EReJ5mVVQMMcYgGIVt/T+qi1STtQ0aI=";
+            })
+            (fetchpatch {
+              url = "https://github.com/alanjds/drf-nested-routers/commit/723a5729dd2ffcb66fe315f229789ca454986fa4.diff";
+              hash = "sha256-UCbBjwlidqsJ9vEEWlGzfqqMOr0xuB2TAaUxHsLzFfU=";
+            })
+            (fetchpatch {
+              url = "https://github.com/alanjds/drf-nested-routers/commit/38e49eb73759bc7dcaaa9166169590f5315e1278.diff";
+              hash = "sha256-IW4BLhHHhXDUZqHaXg46qWoQ89pMXv0ZxKjOCTnDcI0=";
+            })
+          ];
+        });
       });
     };
 
@@ -35,6 +53,7 @@
 
       propagatedBuildInputs = with py.pkgs; [
         bleach
+        boto3
         django_4
         django-cors-headers
         django-debug-toolbar
@@ -49,8 +68,12 @@
         django-taggit
         django-timezone-field
         djangorestframework
+        drf-spectacular
+        drf-spectacular-sidecar
         drf-yasg
+        dulwich
         swagger-spec-validator # from drf-yasg[validation]
+        feedparser
         graphene-django
         jinja2
         markdown