Unverified Commit c8d05d5f authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #322953 from GaetanLepage/ruff

parents a24268ed ad03b1f5

pkgs/development/tools/language-servers/ruff-lsp/default.nix

+7 −7
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


buildPythonPackage rec {

  pname = "ruff-lsp";

  version = "0.0.53";

  version = "0.0.54";

  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec { 
    owner = "astral-sh";

    repo = "ruff-lsp";

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

    hash = "sha256-gtMqIsgGCzSBo5D4+Ne8tUloDV9+MufYkN96yr7XVd4=";

    hash = "sha256-VSuEjrRiHWA78DWQgbj0D+GFjhXrREUOHUcQpFqflcw=";

  };



  postPatch = ''
@@ -32,11 +32,11 @@ buildPythonPackage rec { 
    sed -i '/"ruff>=/d' pyproject.toml

  '';



  nativeBuildInputs = [

  build-system = [

    hatchling

  ];



  propagatedBuildInputs = [

  dependencies = [

    packaging

    pygls

    lsprotocol
@@ -63,12 +63,12 @@ buildPythonPackage rec { 
    "--unset PYTHONPATH"

  ];



  meta = with lib; {

  meta = {

    changelog = "https://github.com/astral-sh/ruff-lsp/releases/tag/v${version}";

    description = "Language Server Protocol implementation for Ruff";

    homepage = "https://github.com/astral-sh/ruff-lsp";

    license = licenses.mit;

    license = lib.licenses.mit;

    mainProgram = "ruff-lsp";

    maintainers = with maintainers; [ figsoda kalekseev ];

    maintainers = with lib.maintainers; [ figsoda kalekseev ];

  };

}

pkgs/development/tools/ruff/Cargo.lock

+109 −328

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/development/tools/ruff/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -12,20 +12,20 @@ 


rustPlatform.buildRustPackage rec {

  pname = "ruff";

  version = "0.4.10";

  version = "0.5.0";



  src = fetchFromGitHub {

    owner = "astral-sh";

    repo = "ruff";

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

    hash = "sha256-FRBuvXtnbxRWoI0f8SM0U0Z5TRyX5Tbgq3d34Oh2bG4=";

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

    hash = "sha256-OjMoa247om4DLPZ6u0XPMd5L+LYlVzHL39plCCr/fYE=";

  };



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ=";

      "salsa-2022-0.1.0" = "sha256-mt+X1hO+5ZrCAgy6N4aArnixJ9GjY/KwM0uIMUSrDsg=";

      "salsa-0.18.0" = "sha256-keVEmSwV1Su1RlOTaIu253FZidk279qA+rXcCeuOggc=";

    };

  };
@@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec { 
  meta = {

    description = "Extremely fast Python linter";

    homepage = "https://github.com/astral-sh/ruff";

    changelog = "https://github.com/astral-sh/ruff/releases/tag/v${version}";

    changelog = "https://github.com/astral-sh/ruff/releases/tag/${version}";

    license = lib.licenses.mit;

    mainProgram = "ruff";

    maintainers = with lib.maintainers; [

pkgs/tools/misc/nbqa/default.nix

+9 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { 
    hash = "sha256-vRJxpWs2i4A8gi8F4YrTlmgBSnA73KeMCrmjLNF1zpA=";

  };



  nativeBuildInputs = with python3.pkgs; [

  build-system = with python3.pkgs; [

    setuptools

  ];
@@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { 
    ruff = [ ruff ];

  };



  propagatedBuildInputs = with python3.pkgs;

  dependencies = with python3.pkgs;

    [

      autopep8

      ipython
@@ -82,6 +82,10 @@ python3.pkgs.buildPythonApplication rec { 
    "test_unable_to_reconstruct_message_pythonpath"

    "test_with_subcommand"

    "test_pylint_works"



    # Test cases not updated to work with ruff>=0.5.0

    # https://github.com/nbQA-dev/nbQA/issues/856

    "test_ruff_works"

  ];



  disabledTestPaths = [
@@ -89,12 +93,12 @@ python3.pkgs.buildPythonApplication rec { 
    "tests/test_include_exclude.py"

  ];



  meta = with lib; {

  meta = {

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

    changelog = "https://nbqa.readthedocs.io/en/latest/history.html";

    description = "Run ruff, isort, pyupgrade, mypy, pylint, flake8, black, blacken-docs, and more on Jupyter Notebooks";

    license = licenses.mit;

    maintainers = with maintainers; [ l0b0 ];

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [ l0b0 ];

    mainProgram = "nbqa";

  };

}