diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-06 00:02:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-06 00:02:17 +0000 |
| commit | 8660ec23c78ad726f0a7dd3acdad92fd598d9712 (patch) | |
| tree | f8d82deca5c2a6b8aad36b0c09c3b9c1c56a5e49 /pkgs/development/tools | |
| parent | ac779b472ecb12c2a1d8f0b05384011113e86a0f (diff) | |
| parent | 5706443baf9ce6a4cdb09f0c8463429c0549a9df (diff) | |
| download | nixlib-8660ec23c78ad726f0a7dd3acdad92fd598d9712.tar nixlib-8660ec23c78ad726f0a7dd3acdad92fd598d9712.tar.gz nixlib-8660ec23c78ad726f0a7dd3acdad92fd598d9712.tar.bz2 nixlib-8660ec23c78ad726f0a7dd3acdad92fd598d9712.tar.lz nixlib-8660ec23c78ad726f0a7dd3acdad92fd598d9712.tar.xz nixlib-8660ec23c78ad726f0a7dd3acdad92fd598d9712.tar.zst nixlib-8660ec23c78ad726f0a7dd3acdad92fd598d9712.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/ruff/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/taplo/default.nix | 18 |
2 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index ce737d343b70..b51b7b6e578d 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-wCjPlKlw0IAh5oH4W7DUw3KBxR4bt9Ho7ncRL5TbD/0="; + hash = "sha256-U77Bwgbt2T8xkamrWOnOpNRF+8skLWhX8JqgPqowcQw="; }; - cargoHash = "sha256-EHAlsEh3YnAhjIGC9rSgyK3gbKPCJqI6F3uAqZxv2nU="; + cargoHash = "sha256-IBcZRElbeu7Ab/7Q7N5TLhAznXxKsupifR83gfpY61Q="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/taplo/default.nix b/pkgs/development/tools/taplo/default.nix index 43026331f5c7..2f497d6eb931 100644 --- a/pkgs/development/tools/taplo/default.nix +++ b/pkgs/development/tools/taplo/default.nix @@ -1,6 +1,8 @@ { lib , rustPlatform , fetchCrate +, pkg-config +, openssl , stdenv , Security , withLsp ? true @@ -8,17 +10,25 @@ rustPlatform.buildRustPackage rec { pname = "taplo"; - version = "0.8.1"; + version = "0.9.0"; src = fetchCrate { inherit version; pname = "taplo-cli"; - sha256 = "sha256-evNW6OA7rArj0TvOaQgktcQy0tWnel3ZL+ic78e6lOk="; + hash = "sha256-vvb00a6rppx9kKx+pzObT/hW/IsG6RyYFEDp9M5gvqc="; }; - cargoSha256 = "sha256-jeLjoqEieR96mUZQmQtv7P78lmOaF18ruVhZLi/TieQ="; + cargoHash = "sha256-oT7U9htu7J22MqLZb+YXohlB1CVGxHGQvHJu18PeLf8="; - buildInputs = lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; buildFeatures = lib.optional withLsp "lsp"; |