diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index c6195a3017c1..df1f2a4e5e92 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -122,6 +122,8 @@ - `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x). +- `meilisearch_1_11` has been removed, as it is no longer supported. + - Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases. - The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld. diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 7203addaa835..b1cfdc9c0a7e 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -216,6 +216,8 @@ - The `services.snapserver` module has been migrated to use the settings option and render a configuration file instead of passing every option over the command line. +- The `services.meilisearch` module now always defaults to the latest version of meilisearch, as the previous `meilisearch_1_11` package was removed. This is only an issue if you were using the old version. + - The `services.postgresql` module now sets up a systemd unit `postgresql.target`. Depending on `postgresql.target` guarantees that postgres is in read-write mode and initial/ensure scripts were executed. Depending on `postgresql.service` only guarantees a read-only connection. - The `services.mysql` module now restarts the database `on-abnormal`, which means that it now will be restarted in certain situations, it wasn't before. For example an OOM-kill. diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index fb5370a297b2..1c335d8591ed 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -182,21 +182,7 @@ in no_analytics = lib.mkDefault true; }; - warnings = lib.optional (lib.versionOlder cfg.package.version "1.12") '' - Meilisearch 1.11 will be removed in NixOS 25.11. As it was the last - version not to support dumpless upgrades, you will have to manually - migrate your data before that. Instructions can be found at - https://www.meilisearch.com/docs/learn/update_and_migration/updating#using-a-dump - and afterwards, you can set `services.meilisearch.package = pkgs.meilisearch;` - to use the latest version. - ''; - - services.meilisearch.package = lib.mkDefault ( - if lib.versionAtLeast config.system.stateVersion "25.05" then - pkgs.meilisearch - else - pkgs.meilisearch_1_11 - ); + services.meilisearch.package = lib.mkDefault pkgs.meilisearch; # used to restore dumps environment.systemPackages = [ cfg.package ]; diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index 74646e91f6fb..fdedcfed7937 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -4,39 +4,22 @@ fetchFromGitHub, nixosTests, nix-update-script, - version ? "1.22.1", }: -let - # Version 1.11 is kept here as it was the last version not to support dumpless - # upgrades, meaning NixOS systems that have set up their data before 25.05 - # would not be able to update to 1.12+ without manual data migration. - # We're planning to remove it towards NixOS 25.11. Make sure to update - # the meilisearch module accordingly and to remove the meilisearch_1_11 - # attribute from all-packages.nix at that point too. - hashes = { - "1.22.1" = "sha256-RWHu77/GoSMzRU7KyKmu23DFwWn6RD3MUWUc5ICY1d8="; - "1.11.3" = "sha256-CVofke9tOGeDEhRHEt6EYwT52eeAYNqlEd9zPpmXQ2U="; - }; - cargoHashes = { - "1.22.1" = "sha256-xKBYumdb1vJS+UQF3yD/p+7FvWRfBKbLjOFiT7DVJ+o="; - "1.11.3" = "sha256-cEJTokDJQuc9Le5+3ObMDNJmEhWEb+Qh0TV9xZkD9D8="; - }; -in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "meilisearch"; - inherit version; + version = "1.22.1"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meiliSearch"; - tag = "v${version}"; - hash = hashes.${version}; + tag = "v${finalAttrs.version}"; + hash = "sha256-RWHu77/GoSMzRU7KyKmu23DFwWn6RD3MUWUc5ICY1d8="; }; cargoBuildFlags = [ "--package=meilisearch" ]; - cargoHash = cargoHashes.${version}; + cargoHash = "sha256-xKBYumdb1vJS+UQF3yD/p+7FvWRfBKbLjOFiT7DVJ+o="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; @@ -57,7 +40,7 @@ rustPlatform.buildRustPackage { description = "Powerful, fast, and an easy to use search engine"; mainProgram = "meilisearch"; homepage = "https://docs.meilisearch.com/"; - changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${version}"; + changelog = "https://github.com/meilisearch/meilisearch/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ happysalada @@ -70,4 +53,4 @@ rustPlatform.buildRustPackage { "x86_64-darwin" ]; }; -} +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index aa608db0e575..673fef91c6a8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1683,6 +1683,7 @@ mapAliases { }; # Added 2025-02-20 mcomix3 = mcomix; # Added 2022-06-05 mdt = md-tui; # Added 2024-09-03 + meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03 meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17 memorymapping = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05 memorymappingHook = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c5a33b35044..0cd924e5b6a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14644,8 +14644,6 @@ with pkgs; openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; - meilisearch_1_11 = callPackage ../by-name/me/meilisearch/package.nix { version = "1.11.3"; }; - muse = libsForQt5.callPackage ../applications/audio/muse { }; nixDependencies = recurseIntoAttrs (