Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rust-analyzer: init at unstable-2020-03-09 #77752

Merged
merged 11 commits into from
Apr 14, 2020
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5612,6 +5612,16 @@
githubId = 108072;
name = "Slawomir Gonet";
};
oxalica = {
email = "[email protected]";
github = "oxalica";
githubId = 14816024;
name = "oxalica";
keys = [{
longkeyid = "rsa4096/0xCED392DE0C483D00";
fingerprint = "5CB0 E9E5 D5D5 71F5 7F54 0FEA CED3 92DE 0C48 3D00";
}];
};
oxij = {
email = "[email protected]";
github = "oxij";
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/node-packages/node-packages-v10.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
, "react-native-cli"
, "react-tools"
, "reveal.js"
, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" }
, "s3http"
, "semver"
, "serve"
Expand Down
5,364 changes: 3,366 additions & 1,998 deletions pkgs/development/node-packages/node-packages-v10.nix

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions pkgs/development/node-packages/node-packages-v12.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1372,22 +1372,22 @@ let
sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
};
};
"mkdirp-0.5.4" = {
"mkdirp-0.5.5" = {
name = "mkdirp";
packageName = "mkdirp";
version = "0.5.4";
version = "0.5.5";
src = fetchurl {
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz";
sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==";
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
};
};
"mkdirp-1.0.3" = {
"mkdirp-1.0.4" = {
name = "mkdirp";
packageName = "mkdirp";
version = "1.0.3";
version = "1.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz";
sha512 = "6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==";
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz";
sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==";
};
};
"ms-2.0.0" = {
Expand Down Expand Up @@ -1426,13 +1426,13 @@ let
sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
};
};
"needle-2.4.0" = {
"needle-2.4.1" = {
name = "needle";
packageName = "needle";
version = "2.4.0";
version = "2.4.1";
src = fetchurl {
url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz";
sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==";
url = "https://registry.npmjs.org/needle/-/needle-2.4.1.tgz";
sha512 = "x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==";
};
};
"nijs-0.0.25" = {
Expand Down Expand Up @@ -1759,13 +1759,13 @@ let
sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
};
};
"psl-1.7.0" = {
"psl-1.8.0" = {
name = "psl";
packageName = "psl";
version = "1.7.0";
version = "1.8.0";
src = fetchurl {
url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==";
url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz";
sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==";
};
};
"punycode-2.1.1" = {
Expand Down Expand Up @@ -2011,13 +2011,13 @@ let
sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==";
};
};
"signal-exit-3.0.2" = {
"signal-exit-3.0.3" = {
name = "signal-exit";
packageName = "signal-exit";
version = "3.0.2";
version = "3.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
};
};
"slasp-0.0.4" = {
Expand Down Expand Up @@ -2857,7 +2857,7 @@ in
sources."minimist-1.2.5"
sources."minipass-3.1.1"
sources."minizlib-2.1.0"
sources."mkdirp-0.5.4"
sources."mkdirp-0.5.5"
sources."ncp-0.4.2"
sources."nijs-0.0.25"
sources."nopt-3.0.6"
Expand Down Expand Up @@ -2896,7 +2896,7 @@ in
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
sources."proto-list-1.2.4"
sources."psl-1.7.0"
sources."psl-1.8.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
(sources."readable-stream-2.3.7" // {
Expand All @@ -2912,7 +2912,7 @@ in
sources."safer-buffer-2.1.2"
sources."semver-7.1.3"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.2"
sources."signal-exit-3.0.3"
sources."slasp-0.0.4"
sources."slide-1.1.6"
sources."spdx-correct-3.1.0"
Expand All @@ -2930,7 +2930,7 @@ in
sources."strip-ansi-3.0.1"
(sources."tar-6.0.1" // {
dependencies = [
sources."mkdirp-1.0.3"
sources."mkdirp-1.0.4"
];
})
sources."temp-0.9.1"
Expand Down Expand Up @@ -3028,7 +3028,7 @@ in
sources."minimist-1.2.5"
sources."minipass-2.9.0"
sources."minizlib-1.3.3"
sources."mkdirp-0.5.4"
sources."mkdirp-0.5.5"
sources."nopt-4.0.3"
sources."npmlog-4.1.2"
sources."number-is-nan-1.0.1"
Expand All @@ -3041,7 +3041,7 @@ in
sources."path-is-absolute-1.0.1"
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
sources."psl-1.7.0"
sources."psl-1.8.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."readable-stream-2.3.7"
Expand All @@ -3051,7 +3051,7 @@ in
sources."safer-buffer-2.1.2"
sources."semver-5.7.1"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.2"
sources."signal-exit-3.0.3"
sources."sshpk-1.16.1"
sources."string-width-1.0.2"
sources."string_decoder-1.1.1"
Expand Down Expand Up @@ -3137,9 +3137,9 @@ in
sources."minimist-1.2.5"
sources."minipass-2.9.0"
sources."minizlib-1.3.3"
sources."mkdirp-0.5.4"
sources."mkdirp-0.5.5"
sources."ms-2.1.2"
sources."needle-2.4.0"
sources."needle-2.4.1"
sources."nopt-4.0.3"
sources."npm-bundled-1.1.1"
sources."npm-normalize-package-bin-1.0.1"
Expand All @@ -3161,7 +3161,7 @@ in
sources."sax-1.2.4"
sources."semver-5.7.1"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.2"
sources."signal-exit-3.0.3"
sources."string-width-1.0.2"
sources."string_decoder-1.1.1"
sources."strip-ansi-3.0.1"
Expand Down
40 changes: 20 additions & 20 deletions pkgs/development/node-packages/node-packages-v13.nix
Original file line number Diff line number Diff line change
Expand Up @@ -634,22 +634,22 @@ let
sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
};
};
"mkdirp-0.5.4" = {
"mkdirp-0.5.5" = {
name = "mkdirp";
packageName = "mkdirp";
version = "0.5.4";
version = "0.5.5";
src = fetchurl {
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz";
sha512 = "iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==";
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz";
sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==";
};
};
"mkdirp-1.0.3" = {
"mkdirp-1.0.4" = {
name = "mkdirp";
packageName = "mkdirp";
version = "1.0.3";
version = "1.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz";
sha512 = "6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==";
url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz";
sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==";
};
};
"ncp-0.4.2" = {
Expand Down Expand Up @@ -850,13 +850,13 @@ let
sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
};
};
"psl-1.7.0" = {
"psl-1.8.0" = {
name = "psl";
packageName = "psl";
version = "1.7.0";
version = "1.8.0";
src = fetchurl {
url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz";
sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==";
url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz";
sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==";
};
};
"punycode-2.1.1" = {
Expand Down Expand Up @@ -994,13 +994,13 @@ let
sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
};
};
"signal-exit-3.0.2" = {
"signal-exit-3.0.3" = {
name = "signal-exit";
packageName = "signal-exit";
version = "3.0.2";
version = "3.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz";
sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d";
url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz";
sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==";
};
};
"slasp-0.0.4" = {
Expand Down Expand Up @@ -1345,7 +1345,7 @@ in
sources."minimist-1.2.5"
sources."minipass-3.1.1"
sources."minizlib-2.1.0"
sources."mkdirp-0.5.4"
sources."mkdirp-0.5.5"
sources."ncp-0.4.2"
sources."nijs-0.0.25"
sources."nopt-3.0.6"
Expand Down Expand Up @@ -1384,7 +1384,7 @@ in
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
sources."proto-list-1.2.4"
sources."psl-1.7.0"
sources."psl-1.8.0"
sources."punycode-2.1.1"
sources."qs-6.5.2"
(sources."readable-stream-2.3.7" // {
Expand All @@ -1400,7 +1400,7 @@ in
sources."safer-buffer-2.1.2"
sources."semver-7.1.3"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.2"
sources."signal-exit-3.0.3"
sources."slasp-0.0.4"
sources."slide-1.1.6"
sources."spdx-correct-3.1.0"
Expand All @@ -1418,7 +1418,7 @@ in
sources."strip-ansi-3.0.1"
(sources."tar-6.0.1" // {
dependencies = [
sources."mkdirp-1.0.3"
sources."mkdirp-1.0.4"
];
})
sources."temp-0.9.1"
Expand Down
14 changes: 14 additions & 0 deletions pkgs/development/tools/rust/rust-analyzer/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{ pkgs, callPackage }:

{
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
rev = "2020-04-06";
version = "unstable-${rev}";
sha256 = "0cm12707rq88w9yd4kkh26pnaqfvif6yyshk42pfi9vyv4ljfpcv";
cargoSha256 = "0q1qwji407pmklwb27z2jwyrvwyn8zkmrwm4nbcgk53ci4p6a17k";
};

rust-analyzer = callPackage ./wrapper.nix {} {
unwrapped = pkgs.rust-analyzer-unwrapped;
};
}
45 changes: 45 additions & 0 deletions pkgs/development/tools/rust/rust-analyzer/generic.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin
, useJemalloc ? false
, doCheck ? true

# Version specific args
, rev, version, sha256, cargoSha256 }:

rustPlatform.buildRustPackage {
pname = "rust-analyzer-unwrapped";
inherit version cargoSha256;

src = fetchFromGitHub {
owner = "rust-analyzer";
repo = "rust-analyzer";
inherit rev sha256;
};

preBuild = "pushd crates/rust-analyzer";
# Do not checking other crates in checkPhase.
preInstall = "popd";

cargoBuildFlags = lib.optional useJemalloc "--features=jemalloc";

nativeBuildInputs = lib.optionals doCheck [ rustPlatform.rustcSrc ];

buildInputs = lib.optionals stdenv.hostPlatform.isDarwin
[ darwin.apple_sdk.frameworks.CoreServices ];

inherit doCheck;
# Skip tests running `rustup` for `cargo fmt`.
preCheck = ''
fakeRustup=$(mktemp -d)
ln -s $(command -v true) $fakeRustup/rustup
export PATH=$PATH''${PATH:+:}$fakeRustup
export RUST_SRC_PATH=${rustPlatform.rustcSrc}
'';

meta = with stdenv.lib; {
description = "An experimental modular compiler frontend for the Rust language";
homepage = "https://github.com/rust-analyzer/rust-analyzer";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ oxalica ];
platforms = platforms.all;
};
}
Loading