Unverified Commit a1ff35c6 authored by Domen Kožar's avatar Domen Kožar Committed by GitHub
Browse files

Merge pull request #289643 from GaetanLepage/ruff 

ruff: 0.2.1 -> 0.2.2, uv: 0.1.3 -> 0.1.4
parents 347a8ce6 51e918d4

pkgs/by-name/uv/uv/Cargo.lock

+4 −3
Original line number Diff line number Diff line
@@ -203,9 +203,9 @@ dependencies = [ 


[[package]]

name = "async_http_range_reader"

version = "0.5.0"

version = "0.6.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "ea8c52f8b749ec4e8665041001a31208afdae9ef88916d2edf1610deb8b3616e"

checksum = "5143aaae4ec035a5d7cfda666eab896fe5428a2a8ab09ca651a2dce3a8f06912"

dependencies = [

 "bisection",

 "futures",
@@ -213,6 +213,7 @@ dependencies = [ 
 "itertools 0.12.1",

 "memmap2 0.9.4",

 "reqwest",

 "reqwest-middleware",

 "thiserror",

 "tokio",

 "tokio-stream",
@@ -4114,7 +4115,7 @@ checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" 


[[package]]

name = "uv"

version = "0.1.3"

version = "0.1.4"

dependencies = [

 "anstream",

 "anyhow",

pkgs/by-name/uv/uv/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "uv";

  version = "0.1.3";

  version = "0.1.4";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "astral-sh";

    repo = "uv";

    rev = version;

    hash = "sha256-eOrmVI8Lc9ScWHst72xLayX0UHVij6h/jf2p8AXiIRE=";

    hash = "sha256-0bG1nReTaNqjHXCeW8gg3AWfXpsm8KulX6jsZQMVLlg=";

  };



  cargoDeps = rustPlatform.importCargoLock {

pkgs/development/tools/ruff/default.nix

+3 −21
Original line number Diff line number Diff line 
{ lib

, rustPlatform

, fetchFromGitHub

, fetchpatch

, installShellFiles

, stdenv

, darwin
@@ -11,33 +10,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "ruff";

  version = "0.2.1";

  version = "0.2.2";



  src = fetchFromGitHub {

    owner = "astral-sh";

    repo = "ruff";

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

    hash = "sha256-VcDDGi6fPGZ75+J7aOSr7S6Gt5bpr0vM2Sk/Utlmf4k=";

    hash = "sha256-wCjPlKlw0IAh5oH4W7DUw3KBxR4bt9Ho7ncRL5TbD/0=";

  };



  patches = [

    # TODO: remove at next release

    (fetchpatch {

      name = "filter-out-test-rules-in-ruleselector-json-schema";

      url = "https://github.com/astral-sh/ruff/commit/49c5e715f9c85aa8d0412b2ec9b1dd6f7ae24c5c.patch";

      hash = "sha256-s0Nv5uW3TKfKgro3V3E8Q0c8uOTgOKZQx9CxXge4YWE=";

    })

  ];



  # The following specific substitution is not working as the current directory is `/build/source` and thus has no mention of `ruff` in it.

  # https://github.com/astral-sh/ruff/blob/866bea60a5de3c59d2537b0f3a634ae0ac9afd94/crates/ruff/tests/show_settings.rs#L12

  # -> Just patch it so that it expects the actual current directory and not `"[BASEPATH]"`.

  postPatch = ''

    substituteInPlace crates/ruff/tests/snapshots/show_settings__display_default_settings.snap \

      --replace '"[BASEPATH]"' '"'$PWD'"'

  '';



  cargoHash = "sha256-B7AiDNWEN4i/Lz9yczlRNXczQph52SMa3pcxK2AtO2A=";

  cargoHash = "sha256-EHAlsEh3YnAhjIGC9rSgyK3gbKPCJqI6F3uAqZxv2nU=";



  nativeBuildInputs = [

    installShellFiles