Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7c4282bf43c7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 11019ea58fc5
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 23, 2020

  1. rust-analyzer: 2020-04-06 -> 2020-04-20

    @oxalica
    oxalica committed Apr 23, 2020
    Copy the full SHA
    a82fe46 View commit details

  2. vscode-extensions.rust-analyzer: 2020-04-06 -> 2020-04-20

    @oxalica
    oxalica committed Apr 23, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b956999 View commit details

  3. Merge pull request #85243 from oxalica/rust-analyzer

    @Mic92
    Mic92 authored Apr 23, 2020
    Copy the full SHA
    11019ea View commit details
2,365 changes: 1,163 additions & 1,202 deletions pkgs/development/node-packages/node-packages-v10.nix
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pkgs/development/tools/rust/rust-analyzer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@

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

rust-analyzer = callPackage ./wrapper.nix {} {
10 changes: 5 additions & 5 deletions pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
View file
Original file line number Diff line number Diff line change
@@ -4,16 +4,16 @@
"dependencies": {
"jsonc-parser": "^2.2.1",
"node-fetch": "^2.6.0",
"vscode-languageclient": "6.1.3",
"vscode-languageclient": "7.0.0-next.1",
"@rollup/plugin-commonjs": "^11.0.2",
"@rollup/plugin-node-resolve": "^7.1.1",
"@types/node": "^12.12.34",
"@types/node-fetch": "^2.5.5",
"@types/vscode": "1.43.0",
"@typescript-eslint/eslint-plugin": "^2.26.0",
"@typescript-eslint/parser": "^2.26.0",
"@types/vscode": "1.44.0",
"@typescript-eslint/eslint-plugin": "^2.27.0",
"@typescript-eslint/parser": "^2.27.0",
"eslint": "^6.8.0",
"rollup": "^2.3.2",
"rollup": "^2.3.3",
"tslib": "^1.11.1",
"typescript": "^3.8.3",
"typescript-formatter": "^7.2.2",