From 878db861024f89f5a8c952e0d6bae4c68e7661d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 04:43:04 +0000 Subject: [PATCH 1/6] python310Packages.libtmux: 0.11.0 -> 0.13.0 --- pkgs/development/python-modules/libtmux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 74515e1c1396..20010ca1f92e 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.11.0"; + version = "0.13.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; - rev = "v${version}"; - hash = "sha256-QbKqS40la6UGZENyGEw5kXigzexp3q7ff43fKlQ9GqE="; + rev = "refs/tags/v${version}"; + hash = "sha256-u08lxVMuyO5CwFbmxn69QqdSWcvGaSMZgizRJlsHa0k="; }; nativeBuildInputs = [ From eb33604cffdfa992c8a54d2c639621b9553f4a95 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 Aug 2022 04:45:00 +0000 Subject: [PATCH 2/6] python310Packages.libtmux: fix build on darwin --- pkgs/development/python-modules/libtmux/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 20010ca1f92e..98261d9fc63e 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , buildPythonPackage , poetry-core @@ -30,6 +31,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = lib.optionals stdenv.isDarwin [ "--ignore=tests/test_test.py" ]; + + pythonImportsCheck = [ "libtmux" ]; + meta = with lib; { description = "Scripting library for tmux"; homepage = "https://libtmux.readthedocs.io/"; From c088cf36823eb28d25a8b43623e1219dd1e18b7b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 Aug 2022 04:45:00 +0000 Subject: [PATCH 3/6] python310Packages.libtmux: update meta --- pkgs/development/python-modules/libtmux/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 98261d9fc63e..199f467fbbca 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -36,9 +36,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "libtmux" ]; meta = with lib; { - description = "Scripting library for tmux"; - homepage = "https://libtmux.readthedocs.io/"; - license = licenses.bsd3; + description = "Typed scripting library / ORM / API wrapper for tmux"; + homepage = "https://libtmux.git-pull.com/"; + changelog = "https://github.com/tmux-python/libtmux/raw/v${version}/CHANGES"; + license = licenses.mit; maintainers = with maintainers; [ ]; }; } From e64306119cede2bdde3560a09f6c5a9cff71ee48 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 Aug 2022 04:45:00 +0000 Subject: [PATCH 4/6] tmuxp: 1.11.0 -> 1.12.1 https://github.com/tmux-python/tmuxp/releases/tag/v1.12.0 https://github.com/tmux-python/tmuxp/releases/tag/v1.12.1 --- pkgs/tools/misc/tmuxp/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index b24c3ead956d..84a4519c0ea5 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -6,13 +6,18 @@ let in pypkgs.buildPythonApplication rec { pname = "tmuxp"; - version = "1.11.0"; + version = "1.12.1"; src = pypkgs.fetchPypi { inherit pname version; - sha256 = "sha256-N5kZ+e17ZgLOCvV/lcT/hdG1VNqLxh98QOQyM0BmZCA="; + sha256 = "078624c5ac7aa4142735f856fadb9281fcebb10e6b98d1be2b2f2bbd106613b9"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "libtmux>=0.12.0,<0.13.0" "libtmux" + ''; + # No tests in archive doCheck = false; From 0aa1c74387b4111aff74f00861ec0506f81557b6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 12 Aug 2022 23:45:00 -0500 Subject: [PATCH 5/6] tmuxp: install completions --- pkgs/tools/misc/tmuxp/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 84a4519c0ea5..14e5da0702eb 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages }: +{ lib, python3Packages, installShellFiles }: let pypkgs = python3Packages; @@ -21,6 +21,8 @@ pypkgs.buildPythonApplication rec { # No tests in archive doCheck = false; + nativeBuildInputs = [ installShellFiles ]; + propagatedBuildInputs = with pypkgs; [ click colorama @@ -28,6 +30,13 @@ pypkgs.buildPythonApplication rec { libtmux ]; + postInstall = '' + installShellCompletion --cmd tmuxp \ + --bash <(_TMUXP_COMPLETE=bash_source $out/bin/tmuxp) \ + --fish <(_TMUXP_COMPLETE=fish_source $out/bin/tmuxp) \ + --zsh <(_TMUXP_COMPLETE=zsh_source $out/bin/tmuxp) + ''; + meta = with lib; { description = "Manage tmux workspaces from JSON and YAML"; homepage = "https://tmuxp.git-pull.com/"; From f401b58ff67c5a31a8778f6fa93bbf7acda1f360 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 Aug 2022 04:45:00 +0000 Subject: [PATCH 6/6] tmuxp: update meta --- pkgs/tools/misc/tmuxp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 14e5da0702eb..768e4d33e3de 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -38,9 +38,10 @@ pypkgs.buildPythonApplication rec { ''; meta = with lib; { - description = "Manage tmux workspaces from JSON and YAML"; + description = "tmux session manager"; homepage = "https://tmuxp.git-pull.com/"; - license = licenses.bsd3; + changelog = "https://github.com/tmux-python/tmuxp/raw/v${version}/CHANGES"; + license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; }