diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2d44cf924d4f..b4c9fccb23ae 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -530,7 +530,6 @@ in { networking.networkd = handleTest ./networking.nix { networkd = true; }; networking.scripted = handleTest ./networking.nix { networkd = false; }; netbox_3_5 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_5; }; - netbox_3_3 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_3; }; netbox_3_6 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_6; }; netbox-upgrade = handleTest ./web-apps/netbox-upgrade.nix {}; # TODO: put in networking.nix after the test becomes more complete diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index a85f3b1b228d..c90e19380383 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -1,32 +1,10 @@ -{ lib, nixosTests, callPackage, fetchpatch }: +{ lib, nixosTests, callPackage, }: let generic = import ./generic.nix; in lib.fix (self: { netbox = self.netbox_3_6; - netbox_3_3 = callPackage generic { - version = "3.3.10"; - hash = "sha256-MeOfTU5IxNDoUh7FyvwAQNRC/CE0R6p40WnlF+3RuxA="; - extraPatches = [ - # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL - ./config_3_3.patch - ./graphql-3_2_0.patch - # fix compatibility ith django 4.1 - (fetchpatch { - url = "https://github.com/netbox-community/netbox/pull/10341/commits/ce6bf9e5c1bc08edc80f6ea1e55cf1318ae6e14b.patch"; - sha256 = "sha256-aCPQp6k7Zwga29euASAd+f13hIcZnIUu3RPAzNPqgxc="; - }) - ]; - - tests = { - netbox = nixosTests.netbox_3_3; - inherit (nixosTests) netbox-upgrade; - }; - maintainers = with lib.maintainers; [ n0emis raitobezarius ]; - eol = true; - }; - netbox_3_5 = callPackage generic { version = "3.5.9"; hash = "sha256-CJbcuCyTuihDXrObSGyJi2XF+zgWAwcJzjxtkX8pmKs="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ecebbf9591ab..80035ceebfd6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1183,6 +1183,7 @@ mapAliases ({ nccl_cudatoolkit_11 = throw "nccl_cudatoolkit_11 has been renamed to cudaPackages_11.nccl"; # Added 2022-04-04 net_snmp = throw "'net_snmp' has been renamed to/replaced by 'net-snmp'"; # Converted to throw 2023-09-10 + netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 nagiosPluginsOfficial = monitoring-plugins; navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07 ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9e256b732c3..9892fa9f70a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11073,7 +11073,7 @@ with pkgs; netbootxyz-efi = callPackage ../tools/misc/netbootxyz-efi { }; inherit (callPackage ../servers/web-apps/netbox { }) - netbox netbox_3_3 netbox_3_5 netbox_3_6; + netbox netbox_3_5 netbox_3_6; netbox2netshot = callPackage ../tools/admin/netbox2netshot { };