From c4e5381072c3b41e759eb5ce7bc985391f9180d6 Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Fri, 12 Apr 2024 00:07:09 +0100 Subject: [PATCH] unifi: remove unifiLTS, unifi5, unifi6 --- .../manual/release-notes/rl-2405.section.md | 2 ++ nixos/tests/unifi.nix | 4 +--- pkgs/servers/unifi/default.nix | 20 ------------------- pkgs/top-level/aliases.nix | 5 ++++- pkgs/top-level/all-packages.nix | 3 --- 5 files changed, 7 insertions(+), 27 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 858f1d2a6138..f9b9ef65e5a8 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -195,6 +195,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `services.neo4j.allowUpgrade` was removed and no longer has any effect. Neo4j 5 supports automatic rolling upgrades. +- `unifiLTS`, `unifi5` and `unifi6` have been removed, as they require MongoDB versions which are end-of-life. All these versions can be upgraded to `unifi7` directly. + - `nitter` requires a `guest_accounts.jsonl` to be provided as a path or loaded into the default location at `/var/lib/nitter/guest_accounts.jsonl`. See [Guest Account Branch Deployment](https://github.com/zedeus/nitter/wiki/Guest-Account-Branch-Deployment) for details. - `boot.supportedFilesystems` and `boot.initrd.supportedFilesystems` are now attribute sets instead of lists. Assignment from lists as done previously is still supported, but checking whether a filesystem is enabled must now by done using `supportedFilesystems.fs or false` instead of using `lib.elem "fs" supportedFilesystems` as was done previously. diff --git a/nixos/tests/unifi.nix b/nixos/tests/unifi.nix index d371bafd6965..789b11b55985 100644 --- a/nixos/tests/unifi.nix +++ b/nixos/tests/unifi.nix @@ -31,8 +31,6 @@ let ''; }; in with pkgs; { - unifiLTS = makeAppTest unifiLTS; - unifi5 = makeAppTest unifi5; - unifi6 = makeAppTest unifi6; unifi7 = makeAppTest unifi7; + unifi8 = makeAppTest unifi8; } diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 766b9cc19be4..8eba1a4953b2 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -45,26 +45,6 @@ let in rec { # see https://community.ui.com/releases / https://www.ui.com/download/unifi - unifiLTS = generic { - version = "5.6.42"; - sha256 = "0wxkv774pw43c15jk0sg534l5za4j067nr85r5fw58iar3w2l84x"; - }; - - unifi5 = generic { - version = "5.14.23"; - sha256 = "1aar05yjm3z5a30x505w4kakbyz35i7mk7xyg0wm4ml6h94d84pv"; - - postInstall = '' - # Remove when log4j is updated to 2.12.2 or 2.16.0. - ${zip}/bin/zip -q -d $out/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class - ''; - }; - - unifi6 = generic { - version = "6.5.55"; - sha256 = "sha256-NUGRO+f6JzWvYPwiitZsgp+LQwnGSncnost03mgNVxA="; - }; - unifi7 = generic { version = "7.5.187"; suffix = "-f57f5bf7ab"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 30c6bcc3e2ff..a50923294c48 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1235,7 +1235,10 @@ mapAliases ({ unicorn-emu = unicorn; # Added 2020-10-29 uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; unifi-poller = unpoller; # Added 2022-11-24 - unifiStable = unifi6; # Added 2020-12-28 + unifi5 = throw "'unifi5' has been removed since its required MongoDB version is EOL."; # Added 2024-04-11 + unifi6 = throw "'unifi6' has been removed since its required MongoDB version is EOL."; # Added 2024-04-11 + unifiLTS = throw "'unifiLTS' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Added 2024-04-11 + unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11 untrunc = untrunc-anthwlock; # Added 2021-02-01 urlview = throw "'urlview' has been dropped because it's unmaintained. Consider switching to an alternative such as `pkgs.extract_url` or `pkgs.urlscan`."; # Added 2023-12-14 urxvt_autocomplete_all_the_things = rxvt-unicode-plugins.autocomplete-all-the-things; # Added 2020-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9629737b55dc..b741955279b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26949,9 +26949,6 @@ with pkgs; axis2 = callPackage ../servers/http/tomcat/axis2 { }; inherit (callPackages ../servers/unifi { }) - unifiLTS - unifi5 - unifi6 unifi7 unifi8;