diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-02 02:32:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-02 02:32:51 +0000 |
| commit | c8ea5daaaf2d29ac0b1226c190d35a5481d37ba9 (patch) | |
| tree | 8ced054a1193282159a27354bf93e43c7aa721e1 /pkgs/development/tools/rust | |
| parent | 42b70ad7f1a189f322f9fec7acd901f44c9f4283 (diff) | |
| parent | b21b75786db414da726a03e32a1892e97470aa97 (diff) | |
| download | nixpkgs-c8ea5daaaf2d29ac0b1226c190d35a5481d37ba9.tar nixpkgs-c8ea5daaaf2d29ac0b1226c190d35a5481d37ba9.tar.gz nixpkgs-c8ea5daaaf2d29ac0b1226c190d35a5481d37ba9.tar.bz2 nixpkgs-c8ea5daaaf2d29ac0b1226c190d35a5481d37ba9.tar.lz nixpkgs-c8ea5daaaf2d29ac0b1226c190d35a5481d37ba9.tar.xz nixpkgs-c8ea5daaaf2d29ac0b1226c190d35a5481d37ba9.tar.zst nixpkgs-c8ea5daaaf2d29ac0b1226c190d35a5481d37ba9.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools/rust')
| -rw-r--r-- | pkgs/development/tools/rust/rust-analyzer/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/development/tools/rust/sqlx-cli/default.nix | 6 |
2 files changed, 7 insertions, 23 deletions
diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index a038e9d65d2..066ecefaa14 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake, fetchpatch +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake , libiconv , useMimalloc ? false , doCheck ? true @@ -6,32 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-05-17"; - cargoSha256 = "sha256-uSBukInJ3FEMmMpG9DN3XeXm+hzUFqCrZORb4NIEJhw="; + version = "2021-05-31"; + cargoSha256 = "sha256-atfpcP3esMQQ2lOFTKksQH1nV78KAic51XZi+R++vHg="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-BsabpY4LArfsDPAMsggxKu1+OQZmqRe//+a5uBcuFps="; + sha256 = "sha256-v2zS9qnvNrImQ3UqU80YagwLJKkVxwvwMMISimFbMOI="; }; - patches = [ - # Revert updates which require rust 1.52.0. - # We currently have rust 1.51.0 in nixpkgs. - # https://github.com/rust-analyzer/rust-analyzer/pull/8718 - (fetchpatch { - url = "https://github.com/rust-analyzer/rust-analyzer/pull/8718/commits/607d8a2f61e56fabb7a3bc5132592917fcdca970.patch"; - sha256 = "sha256-g1yyq/XSwGxftnqSW1bR5UeMW4gW28f4JciGvwQ/n08="; - revert = true; - }) - (fetchpatch { - url = "https://github.com/rust-analyzer/rust-analyzer/pull/8718/commits/6a16ec52aa0d91945577c99cdf421b303b59301e.patch"; - sha256 = "sha256-n7Ew/0fG8zPaMFCi8FVLjQZwJSaczI/QoehC6pDLrAk="; - revert = true; - }) - ]; - buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index d13481804c4..c183ddb760f 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.5.2"; + version = "0.5.5"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - sha256 = "0jz0gddw1xp51rnap0dsyq4886x2glmr087r1lf3fxlnv6anaqn9"; + sha256 = "1051vldajdbkcxvrw2cig201c4nm68cvvnr2yia9f2ysmr68x5rh"; }; - cargoSha256 = "046blw366d6zjpq944g9n4cdhhv2w97qfi1ynljc9bnz03d8v39c"; + cargoSha256 = "1ry893gjrwb670v80ff61yb00jvf49yp6194gqrjvnyarjc6bbb1"; doCheck = false; cargoBuildFlags = [ "-p sqlx-cli" ]; |