From c15e8505e1839e21eda59912ccab125c312e5fbc Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 30 Sep 2024 21:29:17 -0500 Subject: [PATCH 1/4] smassh: fix textual version --- pkgs/by-name/sm/smassh/package.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sm/smassh/package.nix b/pkgs/by-name/sm/smassh/package.nix index 15ca2dd6ac35..fb3de46e9ff9 100644 --- a/pkgs/by-name/sm/smassh/package.nix +++ b/pkgs/by-name/sm/smassh/package.nix @@ -23,13 +23,26 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core ]; - pythonRelaxDeps = [ "textual" ]; - propagatedBuildInputs = with python3.pkgs; [ - textual appdirs click requests + (textual.overridePythonAttrs (oldAttrs: { + version = "0.52.1"; + src = fetchFromGitHub { + owner = "Textualize"; + repo = "textual"; + rev = "refs/tags/v0.52.1"; + hash = "sha256-a5v8HS6ZswQOl/jIypFJTk+MuMsu89H2pAAlWMPkLjI="; + }; + disabledTests = [ + "test_tracked_slugs" + "test_textual_env_var" + "test_register_language" + "test_register_language_existing_language" + "test_language_binary_missing" + ]; + })) ]; # No tests available From ca8c9f103a5b7c49d3d447b40d3272d2edda75b2 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 30 Sep 2024 22:54:32 -0500 Subject: [PATCH 2/4] smassh: 3.1.4 -> 3.1.5 --- pkgs/by-name/sm/smassh/package.nix | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/sm/smassh/package.nix b/pkgs/by-name/sm/smassh/package.nix index fb3de46e9ff9..cb8cd86814d8 100644 --- a/pkgs/by-name/sm/smassh/package.nix +++ b/pkgs/by-name/sm/smassh/package.nix @@ -11,38 +11,28 @@ let in python3.pkgs.buildPythonApplication rec { pname = "smassh"; - version = "3.1.4"; + version = "3.1.5"; pyproject = true; src = fetchFromGitHub { owner = "kraanzu"; repo = "smassh"; rev = "v${version}"; - hash = "sha256-MeLub6zeviY7yyPP2FI9b37nUwHZbxW6onuFXSkmvqk"; + hash = "sha256-1XwuvEDROG4XLUs9uP7VKBOnho4WMyrZU884U+OMHkQ="; }; nativeBuildInputs = with python3.pkgs; [ poetry-core ]; + pythonRelaxDeps = [ + "platformdirs" + "textual" + ]; + propagatedBuildInputs = with python3.pkgs; [ - appdirs click + platformdirs requests - (textual.overridePythonAttrs (oldAttrs: { - version = "0.52.1"; - src = fetchFromGitHub { - owner = "Textualize"; - repo = "textual"; - rev = "refs/tags/v0.52.1"; - hash = "sha256-a5v8HS6ZswQOl/jIypFJTk+MuMsu89H2pAAlWMPkLjI="; - }; - disabledTests = [ - "test_tracked_slugs" - "test_textual_env_var" - "test_register_language" - "test_register_language_existing_language" - "test_language_binary_missing" - ]; - })) + textual ]; # No tests available From 0820598d99c5cb45cca39e19fe1581c074f9b491 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 30 Sep 2024 22:56:05 -0500 Subject: [PATCH 3/4] smassh: add maintainer kraanzu --- pkgs/by-name/sm/smassh/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sm/smassh/package.nix b/pkgs/by-name/sm/smassh/package.nix index cb8cd86814d8..6b8e56a3b804 100644 --- a/pkgs/by-name/sm/smassh/package.nix +++ b/pkgs/by-name/sm/smassh/package.nix @@ -48,7 +48,10 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/kraanzu/smassh"; changelog = "https://github.com/kraanzu/smassh/blob/main/CHANGELOG.md"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ aimpizza ]; + maintainers = with maintainers; [ + aimpizza + kraanzu + ]; mainProgram = "smassh"; }; } From fe9836b27b320017c61f7a637a8d3d4fa67036a7 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 1 Oct 2024 08:25:57 -0500 Subject: [PATCH 4/4] smassh: 3.1.5 -> 3.1.6 --- pkgs/by-name/sm/smassh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sm/smassh/package.nix b/pkgs/by-name/sm/smassh/package.nix index 6b8e56a3b804..d288733fb4f1 100644 --- a/pkgs/by-name/sm/smassh/package.nix +++ b/pkgs/by-name/sm/smassh/package.nix @@ -11,14 +11,14 @@ let in python3.pkgs.buildPythonApplication rec { pname = "smassh"; - version = "3.1.5"; + version = "3.1.6"; pyproject = true; src = fetchFromGitHub { owner = "kraanzu"; repo = "smassh"; rev = "v${version}"; - hash = "sha256-1XwuvEDROG4XLUs9uP7VKBOnho4WMyrZU884U+OMHkQ="; + hash = "sha256-P0fZHSsaKIwJspEBxM5MEK3Z4kemXJWlIOQI9cmvlF4="; }; nativeBuildInputs = with python3.pkgs; [ poetry-core ];