From 22012fafdb77a646af8639ba1d9a35c33f4c7cdc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 24 Sep 2025 20:19:04 +0300 Subject: [PATCH] beets-unstable: alias to beets To avoid the former left behind the latter. --- pkgs/tools/audio/beets/default.nix | 13 ++----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index f82175e39bec..67e59ba8c7ea 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -42,23 +42,14 @@ lib.makeExtensible ( beets-minimal = self.beets.override { disableAllPlugins = true; }; - beets-unstable = callPackage ./common.nix { - inherit python3Packages; - version = "2.3.1"; - src = fetchFromGitHub { - owner = "beetbox"; - repo = "beets"; - rev = "d487d675b9115672c484eab8a6729b1f0fd24b68"; - hash = "sha256-INxL2XDn8kwRYYcZATv/NdLmAtfQvxVDWKB1OYo8dxY="; - }; - }; - alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; }; audible = callPackage ./plugins/audible.nix { beets = self.beets-minimal; }; copyartifacts = callPackage ./plugins/copyartifacts.nix { beets = self.beets-minimal; }; filetote = callPackage ./plugins/filetote.nix { beets = self.beets-minimal; }; } // lib.optionalAttrs config.allowAliases { + beets-unstable = lib.warn "beets-unstable was aliased to beets, since upstream releases are frequent nowadays" self.beets; + extrafiles = throw "extrafiles is unmaintained since 2020 and broken since beets 2.0.0"; } ) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3983c112f00e..b150770f0772 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -512,6 +512,7 @@ mapAliases { BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12 beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01 beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18 + inherit (beetsPackages) beets-unstable; betterbird = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25 bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a95aa07adee..989871a1cb8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2392,7 +2392,7 @@ with pkgs; }; beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { }); - inherit (beetsPackages) beets beets-unstable; + inherit (beetsPackages) beets; binlore = callPackage ../development/tools/analysis/binlore { };