Unverified Commit ba06293c authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #317678 from fabaff/textual-bump 

python312Packages.textual: 0.53.1 -> 0.65.1
parents 8222aa92 dd455254

pkgs/by-name/ot/oterm/package.nix

+5 −4
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ 


python3Packages.buildPythonApplication rec {

  pname = "oterm";

  version = "0.2.8";

  version = "0.2.9";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "ggozad";

    repo = "oterm";

    rev = "refs/tags/${version}";

    hash = "sha256-6UFNsEc6bYBrBYfCbeiDfemueeRMEXHGCT8junZVFtk=";

    hash = "sha256-UOZxktgpuTxkE1+DVnd5T1Fye+2SS2hUDmWtCaGEol0=";

  };



  pythonRelaxDeps = [
@@ -22,6 +22,7 @@ python3Packages.buildPythonApplication rec { 
    "ollama"

    "packaging"

    "pillow"

    "textual"

    "typer"

  ];
@@ -29,7 +30,7 @@ python3Packages.buildPythonApplication rec { 


  nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ];



  propagatedBuildInputs = with python3Packages; [

  dependencies = with python3Packages; [

    aiohttp

    aiosql

    aiosqlite
@@ -54,7 +55,7 @@ python3Packages.buildPythonApplication rec { 
    homepage = "https://github.com/ggozad/oterm";

    changelog = "https://github.com/ggozad/oterm/releases/tag/${version}";

    license = lib.licenses.mit;

    mainProgram = "oterm";

    maintainers = with lib.maintainers; [ suhr ];

    mainProgram = "oterm";

  };

}

pkgs/development/python-modules/rich-pixels/default.nix

+18 −25
Original line number Diff line number Diff line
@@ -3,49 +3,42 @@ 
  buildPythonPackage,

  fetchFromGitHub,

  fetchpatch,

  poetry-core,

  pytestCheckHook,

  syrupy,

  hatchling,

  pillow,

  rich,

  pytestCheckHook,

  pythonOlder,

  pythonRelaxDepsHook,

  rich,

  syrupy,

}:



buildPythonPackage rec {

  pname = "rich-pixels";

  version = "2.2.0";

  format = "pyproject";

  version = "3.0.1";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "darrenburns";

    repo = "rich-pixels";

    rev = version;

    hash = "sha256-fbpnHEfBPWLSYhgETqKbdmmzt7Lu/4oKgetjgNvv04c=";

    rev = "refs/tags/${version}";

    hash = "sha256-Sqs0DOyxJBfZmm/SVSTMSmaaeRlusiSp6VBnJjKYjgQ=";

  };



  patches = [

    (fetchpatch {

      name = "fix-version.patch";

      url = "https://github.com/darrenburns/rich-pixels/commit/ff1cc3fef789321831f29e9bf282ae6b337eddb2.patch";

      hash = "sha256-58ZHBNg1RCuOfuE034qF1SbAgoiWMNlSG3c5pCSLUyI=";

    })

  ];



  nativeBuildInputs = [

    poetry-core

    pythonRelaxDepsHook

  ];



  nativeCheckInputs = [ pytestCheckHook ];

  pythonRelaxDeps = [ "pillow" ];



  checkInputs = [ syrupy ];

  build-system = [ hatchling ];



  propagatedBuildInputs = [

  dependencies = [

    pillow

    rich

  ];



  pythonRelaxDeps = [ "pillow" ];

  nativeCheckInputs = [

    pytestCheckHook

    syrupy

  ];



  pythonImportsCheck = [ "rich_pixels" ];

pkgs/development/python-modules/textual-dev/default.nix

+6 −11
Original line number Diff line number Diff line
@@ -6,11 +6,8 @@ 
  fetchFromGitHub,

  msgpack,

  poetry-core,

  pytest-aiohttp,

  pytestCheckHook,

  pythonOlder,

  textual,

  time-machine,

  typing-extensions,

}:
@@ -28,9 +25,9 @@ buildPythonPackage rec { 
    hash = "sha256-QnMKVt1WxnwGnZFNb7Gbus7xewGvyG5xJ0hIKKK5hug=";

  };



  nativeBuildInputs = [ poetry-core ];

  build-system = [ poetry-core ];



  propagatedBuildInputs = [

  dependencies = [

    aiohttp

    click

    msgpack
@@ -38,19 +35,17 @@ buildPythonPackage rec { 
    typing-extensions

  ];



  nativeCheckInputs = [

    pytest-aiohttp

    pytestCheckHook

    time-machine

  ];

  # Tests require a running textual WS server

  doCheck = false;



  pythonImportsCheck = [ "textual_dev" ];



  meta = with lib; {

    description = "Development tools for Textual";

    mainProgram = "textual";

    homepage = "https://github.com/Textualize/textual-dev";

    changelog = "https://github.com/Textualize/textual-dev/releases/tag/v${version}";

    license = licenses.mit;

    maintainers = with maintainers; [ yannip ];

    mainProgram = "textual";

  };

}

pkgs/development/python-modules/textual/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


buildPythonPackage rec {

  pname = "textual";

  version = "0.53.1";

  version = "0.68.0";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec { 
    owner = "Textualize";

    repo = "textual";

    rev = "refs/tags/v${version}";

    hash = "sha256-73qEogHe69B66r4EJOj2RAP95O5z7v/UYARTIEPxrcA=";

    hash = "sha256-nxQVxe7lXMcxyqh4SWcQ/A6eQcEzkSshKmpweHpn7JE=";

  };



  build-system = [ poetry-core ];