From adb168c52ec2c847898608053f4e0314465b2035 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 3 Mar 2025 01:33:03 +0100 Subject: [PATCH 1/2] python313Packages.mrsqm: r4 -> v.0.0.7 was downgraded in bf8d14b4a0340393b69de7d6e3302a718b7942f1 fixes https://hydra.nixos.org/build/287832420 --- pkgs/development/python-modules/mrsqm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix index 66136d339607..9133b0fe4910 100644 --- a/pkgs/development/python-modules/mrsqm/default.nix +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mrsqm"; - version = "4"; + version = "0.0.7"; pyproject = true; build-system = [ @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mlgig"; repo = "mrsqm"; - tag = "r${version}"; - hash = "sha256-59f18zItV3K6tXcg1v1q2Z8HYrQB8T0ntaaqjxeAEbM="; + tag = "v.${version}"; + hash = "sha256-5K6vCU0HExnmYNThZNDCbEtII9bUGauxDtKkJXe/85Q="; }; buildInputs = [ fftw ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace-fail "'pytest-runner'" "" + --replace-fail "setup_requires=['pytest-runner']," "" substituteInPlace pyproject.toml \ --replace-fail "numpy==" "numpy>=" ''; From 14518fc5aaa95d44d402e000b04eefdb326eacc5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 4 Mar 2025 23:43:38 +0100 Subject: [PATCH 2/2] python313Packages.mrsqm: add updateScript This is to try and prevent downgrade come next python-updates --- pkgs/development/python-modules/mrsqm/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix index 9133b0fe4910..33b4b044dd3b 100644 --- a/pkgs/development/python-modules/mrsqm/default.nix +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -11,6 +11,7 @@ pip, setuptools, pytestCheckHook, + nix-update-script, }: buildPythonPackage rec { @@ -63,6 +64,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "mrsqm" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v\\.(.*)" + ]; + }; + meta = { description = "MrSQM (Multiple Representations Sequence Miner) is a time series classifier"; homepage = "https://pypi.org/project/mrsqm";