From d399b903e91fd604e17db0530c225b3b99120388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 3 Jan 2025 01:21:49 +0100 Subject: [PATCH 1/3] mypaint: remove with lib --- pkgs/by-name/my/mypaint/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/my/mypaint/package.nix b/pkgs/by-name/my/mypaint/package.nix index 2977a381c9f9..042f91cd50ce 100644 --- a/pkgs/by-name/my/mypaint/package.nix +++ b/pkgs/by-name/my/mypaint/package.nix @@ -138,11 +138,11 @@ buildPythonApplication rec { runHook postCheck ''; - meta = with lib; { + meta = { description = "Graphics application for digital painters"; homepage = "http://mypaint.org/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ jtojnar ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jtojnar ]; }; } From a7579f374f5923b67d36cf293b045aece77fcd97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 3 Jan 2025 01:22:52 +0100 Subject: [PATCH 2/3] mypaint: fetchFromGitHub rev -> tag --- pkgs/by-name/my/mypaint/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/my/mypaint/package.nix b/pkgs/by-name/my/mypaint/package.nix index 042f91cd50ce..c9ff4b251bb2 100644 --- a/pkgs/by-name/my/mypaint/package.nix +++ b/pkgs/by-name/my/mypaint/package.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "mypaint"; repo = "mypaint"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-rVKcxzWZRLcuxK8xRyRgvitXAh4uOEyqHswLeTdA2Mk="; fetchSubmodules = true; }; From fcfea6f887f17783c311b4c7635326ad668f9f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 3 Jan 2025 01:20:10 +0100 Subject: [PATCH 3/3] mypaint: disable tests --- pkgs/by-name/my/mypaint/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/my/mypaint/package.nix b/pkgs/by-name/my/mypaint/package.nix index c9ff4b251bb2..1bd95b060598 100644 --- a/pkgs/by-name/my/mypaint/package.nix +++ b/pkgs/by-name/my/mypaint/package.nix @@ -130,6 +130,10 @@ buildPythonApplication rec { runHook postInstall ''; + # tests require unmaintained and removed nose, it should switch to pytest + # https://github.com/mypaint/mypaint/issues/1191 + doCheck = false; + checkPhase = '' runHook preCheck