Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

netbox: 3.4.7 -> 3.5.0 #228405

Merged
merged 3 commits into from
Apr 29, 2023
+26 −3
Merged

netbox: 3.4.7 -> 3.5.0 #228405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e44149
netbox: 3.4.7 -> 3.4.9
minijackson Apr 26, 2023
fff8deb
netbox: 3.4.9 -> 3.4.10
minijackson Apr 27, 2023
78f9e2e
netbox: 3.4.10 -> 3.5.0
minijackson Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nixos/doc/manual/release-notes/rl-2305.section.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,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`.

Expand Down
4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/netbox/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ in
};

netbox = callPackage generic {
version = "3.4.7";
hash = "sha256-pWHGyzLc0tqfehWbCMF1l96L1pewb5FXBUkw9EqPtP8=";
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
Expand Down
23 changes: 23 additions & 0 deletions pkgs/servers/web-apps/netbox/generic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ lib
, fetchFromGitHub
, fetchpatch
, python3
, version
, hash
Expand All @@ -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=";
})
];
});
});
};

Expand All @@ -35,6 +53,7 @@

propagatedBuildInputs = with py.pkgs; [
bleach
boto3
django_4
django-cors-headers
django-debug-toolbar
Expand All @@ -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
Expand Down