From ee1e417d88469317acbde0756831aa6c2ce3b693 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Tue, 18 Mar 2025 10:30:49 -0400 Subject: [PATCH 1/2] python312Packages.lap: init at 0.5.12 Co-Authored-By: Doron Behar --- .../python-modules/lap/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/lap/default.nix diff --git a/pkgs/development/python-modules/lap/default.nix b/pkgs/development/python-modules/lap/default.nix new file mode 100644 index 000000000000..eb18a1f4bdb2 --- /dev/null +++ b/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 + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04261021c475..be5072d7403b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7317,6 +7317,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 { }; From 25b6ffb800c13891658350030cab812cbe0f531c Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Tue, 18 Mar 2025 11:04:43 -0400 Subject: [PATCH 2/2] beets-unstable: 2024-12-02 -> 2025-03-12 Co-Authored-By: Doron Behar --- pkgs/tools/audio/beets/builtin-plugins.nix | 8 ++++++++ pkgs/tools/audio/beets/common.nix | 17 ++++++----------- pkgs/tools/audio/beets/default.nix | 19 +++++++++++++++---- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix index bcb22caab20c..ece354ab29e7 100644 --- a/pkgs/tools/audio/beets/builtin-plugins.nix +++ b/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 = [ ]; + }; +} diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index ed070d8fb4d5..d06e10494b59 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/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 ] diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 2a4540681f6f..70d3b644d692 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/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="; }; };