Skip to content

Commit 859e55c

Browse files
authored
NetBox: 4.2.7 -> 4.2.9 + cleanup (#401110)
2 parents 5120f96 + 59e547a commit 859e55c

File tree

8 files changed

+27
-214
lines changed

8 files changed

+27
-214
lines changed

nixos/tests/web-apps/netbox-upgrade.nix

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
import ../make-test-python.nix (
22
{ lib, pkgs, ... }:
33
let
4-
oldNetbox = pkgs.netbox_3_7;
5-
newNetbox = pkgs.netbox_4_1;
4+
oldNetbox = "netbox_4_1";
5+
newNetbox = "netbox_4_2";
6+
7+
apiVersion =
8+
version:
9+
lib.pipe version [
10+
(lib.splitString ".")
11+
(lib.take 2)
12+
(lib.concatStringsSep ".")
13+
];
14+
oldApiVersion = apiVersion pkgs."${oldNetbox}".version;
15+
newApiVersion = apiVersion pkgs."${newNetbox}".version;
616
in
717
{
818
name = "netbox-upgrade";
@@ -15,12 +25,14 @@ import ../make-test-python.nix (
1525
};
1626

1727
nodes.machine =
18-
{ config, ... }:
28+
{ config, pkgs, ... }:
1929
{
2030
virtualisation.memorySize = 2048;
2131
services.netbox = {
2232
enable = true;
23-
package = oldNetbox;
33+
# Pick the NetBox package from this config's "pkgs" argument,
34+
# so that `nixpkgs.config.permittedInsecurePackages` works
35+
package = pkgs."${oldNetbox}";
2436
secretKeyFile = pkgs.writeText "secret" ''
2537
abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
2638
'';
@@ -42,22 +54,13 @@ import ../make-test-python.nix (
4254

4355
networking.firewall.allowedTCPPorts = [ 80 ];
4456

45-
specialisation.upgrade.configuration.services.netbox.package = lib.mkForce newNetbox;
57+
nixpkgs.config.permittedInsecurePackages = [ pkgs."${oldNetbox}".name ];
58+
59+
specialisation.upgrade.configuration.services.netbox.package = lib.mkForce pkgs."${newNetbox}";
4660
};
4761

4862
testScript =
4963
{ nodes, ... }:
50-
let
51-
apiVersion =
52-
version:
53-
lib.pipe version [
54-
(lib.splitString ".")
55-
(lib.take 2)
56-
(lib.concatStringsSep ".")
57-
];
58-
oldApiVersion = apiVersion oldNetbox.version;
59-
newApiVersion = apiVersion newNetbox.version;
60-
in
6164
''
6265
start_all()
6366
machine.wait_for_unit("netbox.target")

pkgs/by-name/ne/netbox_4_1/package.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ py.pkgs.buildPythonApplication rec {
127127
description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool";
128128
mainProgram = "netbox";
129129
license = lib.licenses.asl20;
130+
knownVulnerabilities = [
131+
"Netbox version ${version} is EOL; please upgrade by following the current release notes instructions."
132+
];
130133
maintainers = with lib.maintainers; [
131134
minijackson
132135
raitobezarius

pkgs/by-name/ne/netbox_4_2/package.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
python3,
55
plugins ? _ps: [ ],
66
nixosTests,
7+
nix-update-script,
78
}:
89
let
910
py = python3.override {
@@ -14,15 +15,15 @@ let
1415
in
1516
py.pkgs.buildPythonApplication rec {
1617
pname = "netbox";
17-
version = "4.2.7";
18+
version = "4.2.9";
1819

1920
format = "other";
2021

2122
src = fetchFromGitHub {
2223
owner = "netbox-community";
2324
repo = "netbox";
2425
tag = "v${version}";
25-
hash = "sha256-SZES80hdoP+k6o5ablMnwaFrsVGE8Baew44eX2ZCk/Y=";
26+
hash = "sha256-uVe4YTZoxRMBfvItFa9SMHu4AaVvygfAg9GDB115TFc=";
2627
};
2728

2829
patches = [
@@ -112,6 +113,7 @@ py.pkgs.buildPythonApplication rec {
112113
netbox = nixosTests.netbox_4_2;
113114
inherit (nixosTests) netbox-upgrade;
114115
};
116+
updateScript = nix-update-script { };
115117
};
116118

117119
meta = {

pkgs/servers/web-apps/netbox/config.patch

Lines changed: 0 additions & 50 deletions
This file was deleted.

pkgs/servers/web-apps/netbox/default.nix

Lines changed: 0 additions & 25 deletions
This file was deleted.

pkgs/servers/web-apps/netbox/generic.nix

Lines changed: 0 additions & 119 deletions
This file was deleted.

pkgs/top-level/aliases.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,6 +1247,7 @@ mapAliases {
12471247
neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28
12481248
netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02
12491249
netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22
1250+
netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23
12501251
nextcloud29 = throw ''
12511252
Nextcloud v29 has been removed from `nixpkgs` as the support for is dropped
12521253
by upstream in 2025-04. Please upgrade to at least Nextcloud v30 by declaring

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3864,8 +3864,6 @@ with pkgs;
38643864
hdf5 = hdf5-mpi.override { usev110Api = true; };
38653865
};
38663866

3867-
inherit (callPackage ../servers/web-apps/netbox { }) netbox_3_7;
3868-
38693867
# Not in aliases because it wouldn't get picked up by callPackage
38703868
netbox = netbox_4_2;
38713869

0 commit comments

Comments
 (0)