beets-unstable: 2024-12-02 -> 2025-03-12 (#390984)

pkgs/development/python-modules/lap/default.nix

@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  cython,
+  fetchPypi,
+  numpy,
+  pytestCheckHook,
+  python-utils,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "lap";
+  version = "0.5.12";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-VwtBTqeubAS9SdDsjNrB3FY0c3dVeE1E43+fZourRP0=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeBuildInputs = [ cython ];
+
+  dependencies = [
+    numpy
+    python-utils
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "lap" ];
+  # See https://github.com/NixOS/nixpkgs/issues/255262
+  preCheck = ''
+    cd "$out"
+  '';
+
+  meta = {
+    description = "Linear Assignment Problem solver (LAPJV/LAPMOD)";
+    homepage = "https://github.com/gatagat/lap";
+    changelog = "https://github.com/gatagat/lap/releases/tag/v${version}";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [
+      doronbehar
+      tebriel
+    ];
+  };
+}

pkgs/tools/audio/beets/builtin-plugins.nix

@@ -7,6 +7,8 @@
   mp3gain,
   mp3val,
   python3Packages,
+  version,
+  lib,
   ...
 }:
 {
@@ -170,3 +172,9 @@
   ];
   zero = { };
 }
+# NOTE: There will be no need for this conditional once beets is updated.
+// lib.optionalAttrs (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") {
+  _typing = {
+    testPaths = [ ];
+  };
+}

pkgs/tools/audio/beets/common.nix

@@ -82,17 +82,6 @@ python3Packages.buildPythonApplication {
   pyproject = true;
 
   patches = [
-    (fetchpatch {
-      # Already on master. TODO: remove when updating to the next release
-      # Issue: https://github.com/beetbox/beets/issues/5527
-      # PR: https://github.com/beetbox/beets/pull/5650
-      name = "fix-im-backend";
-      url = "https://github.com/beetbox/beets/commit/1f938674015ee71431fe9bd97c2214f58473efd2.patch";
-      hash = "sha256-koCYeiUhk1ifo6CptOSu3p7Nz0FFUeiuArTknM/tpVQ=";
-      excludes = [
-        "docs/changelog.rst"
-      ];
-    })
   ] ++ extraPatches;
 
   build-system = [
@@ -113,6 +102,9 @@ python3Packages.buildPythonApplication {
       unidecode
       typing-extensions
     ]
+    ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [
+      lap
+    ]
     ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins));
 
   nativeBuildInputs = [
@@ -160,6 +152,9 @@ python3Packages.buildPythonApplication {
       rarfile
       responses
     ]
+    ++ lib.optionals (lib.versionAtLeast version "2.2.0-unstable-2025-03-12") [
+      requests-mock
+    ]
     ++ [
       writableTmpDirAsHomeHook
     ]

pkgs/tools/audio/beets/default.nix

@@ -20,6 +20,17 @@
 */
 let
   extraPatches = [
+    (fetchpatch {
+      # Already on master. TODO: remove when updating to the next release
+      # Issue: https://github.com/beetbox/beets/issues/5527
+      # PR: https://github.com/beetbox/beets/pull/5650
+      name = "fix-im-backend";
+      url = "https://github.com/beetbox/beets/commit/1f938674015ee71431fe9bd97c2214f58473efd2.patch";
+      hash = "sha256-koCYeiUhk1ifo6CptOSu3p7Nz0FFUeiuArTknM/tpVQ=";
+      excludes = [
+        "docs/changelog.rst"
+      ];
+    })
     # Bash completion fix for Nix
     ./patches/bash-completion-always-print.patch
     # Remove after next release.
@@ -46,13 +57,13 @@ lib.makeExtensible (self: {
   beets-minimal = self.beets.override { disableAllPlugins = true; };
 
   beets-unstable = callPackage ./common.nix {
-    inherit python3Packages extraPatches;
-    version = "2.2.0-unstable-2024-12-02";
+    inherit python3Packages;
+    version = "2.2.0-unstable-2025-03-12";
     src = fetchFromGitHub {
       owner = "beetbox";
       repo = "beets";
-      rev = "f92c0ec8b14fbd59e58374fd123563123aef197b";
-      hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";
+      rev = "670a3bcd17a46883c71cf07dd313fcd0dff4be9d";
+      hash = "sha256-hSY7FhpPL4poOY1/gqk7oLNgQ7KA/MJqx50xOLIP0QA=";
     };
   };
 

pkgs/top-level/python-packages.nix

@@ -7335,6 +7335,8 @@ self: super: with self; {
     inherit (pkgs.__splicedPackages) laszip;
   };
 
+  lap = callPackage ../development/python-modules/lap { };
+
   latex2mathml = callPackage ../development/python-modules/latex2mathml { };
 
   latex2pydata = callPackage ../development/python-modules/latex2pydata { };