From 952b1a3d96976364fef3ebf239829dda5436151c Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Mon, 10 Jun 2024 12:00:00 +0000 Subject: [PATCH] nixos/btrbk: undeprecate extraPackages it is required on systems where ssh access is configured for lz4-compressed btrfs send, but no instances are present. fixes https://github.com/NixOS/nixpkgs/issues/316676 --- nixos/doc/manual/release-notes/rl-2405.section.md | 4 +--- nixos/modules/services/backup/btrbk.nix | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 165e3e13a78e..01af034700af 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -680,9 +680,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi The previous native backends remain available but are now minimally maintained. Refer to [upstream documentation](https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend) for further details about each platform. - `services.btrbk` now automatically selects and provides required compression - program depending on the configured `stream_compress` option. Since this - replaces the need for the `extraPackages` option, this option will be - deprecated in future releases. + program depending on the configured `stream_compress` option. - `services.github-runner` module has been removed. To configure a single GitHub Actions Runner refer to `services.github-runners.*`. Note that this will trigger a new runner registration. diff --git a/nixos/modules/services/backup/btrbk.nix b/nixos/modules/services/backup/btrbk.nix index 06ca4236eaf2..fa6c67ff7cbf 100644 --- a/nixos/modules/services/backup/btrbk.nix +++ b/nixos/modules/services/backup/btrbk.nix @@ -204,10 +204,6 @@ in }; config = mkIf (sshEnabled || serviceEnabled) { - warnings = optional (cfg.extraPackages != []) '' - extraPackages option will be deprecated in future releases. Programs required for compression are now automatically selected depending on services.btrbk.instances..settings.stream_compress option. - ''; - environment.systemPackages = [ pkgs.btrbk ] ++ cfg.extraPackages; security.sudo.extraRules = mkIf (sudo_doas == "sudo") [ sudoRule ];