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: 215dbc52531e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 417df00eed24
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 28, 2019

  1. vscode-extensions.ms-vscode.cpptools: 0.25.1 -> 0.26.0

    @eadwu
    eadwu committed Oct 28, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thoughtpolice Austin Seipp
    GPG key ID: 25D2038DEB08021D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3b8c555 View commit details

  2. vscode-extensions.ms-python.python: 2019.6.24221 -> 2019.10.41019

    @eadwu
    eadwu committed Oct 28, 2019
    Copy the full SHA
    4f4e39f View commit details

  3. vscode-extensions.ms-python.python: 2019.10.41019 -> 2019.10.44104

    @eadwu
    eadwu committed Oct 28, 2019
    Copy the full SHA
    5d46fcc View commit details

  4. vscode-extensions.WakaTime.vscode-wakatime: 2.2.0 -> 2.2.1

    @eadwu
    eadwu committed Oct 28, 2019
    Copy the full SHA
    e72a6e5 View commit details

Commits on Oct 29, 2019

  1. Merge pull request #71482 from eadwu/vscode-extensions/update-2 

    vscode-extensions: update 2
    @marsam
    marsam authored Oct 29, 2019
    Copy the full SHA
    417df00 View commit details
Showing with 9 additions and 9 deletions.
  1. +2 −2 pkgs/misc/vscode-extensions/cpptools/default.nix
  2. +5 −5 pkgs/misc/vscode-extensions/python/default.nix
  3. +2 −2 pkgs/misc/vscode-extensions/wakatime/default.nix
4 changes: 2 additions & 2 deletions pkgs/misc/vscode-extensions/cpptools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -83,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "cpptools";
publisher = "ms-vscode";
version = "0.25.1";
sha256 = "1i66m6l4q8vkygn24v5s06kxaxm9gdd8y75fjyzz189pnmijj1as";
version = "0.26.0";
sha256 = "1njclj07amj9n187k3rbjvddkhmsc4aljdbsgjxpj58fv7zdy7kq";
};

buildInputs = [
10 changes: 5 additions & 5 deletions pkgs/misc/vscode-extensions/python/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,14 +23,14 @@ let
else throw "Only x86_64 Linux and Darwin are supported.";

languageServerSha256 = {
linux-x64 = "0j9251f8dfccmg0x9gzg1cai4k5zd0alcfpb0443gs4jqakl0lr2";
osx-x64 = "070qwwl08fa24rsnln4i5x9mfriqaw920l6v2j8d1r0zylxnyjsa";
linux-x64 = "1w3y0sn6ijk1vspi4lailg1q1iy9lwslhx92c7jbrrkiaszvaqwn";
osx-x64 = "11l4fic8cvgh1l3dq6qxi51pwhcic79zf13rhyajl5w5g13caafp";
}.${arch};

# version is languageServerVersion in the package.json
languageServer = extractNuGet rec {
name = "Python-Language-Server";
version = "0.3.40";
version = "0.4.24";

src = fetchurl {
url = "https://pvsc.azureedge.net/python-language-server-stable/${name}-${arch}.${version}.nupkg";
@@ -41,8 +41,8 @@ in vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "python";
publisher = "ms-python";
version = "2019.6.24221";
sha256 = "1l82y3mbplzipcij5a0wqlykypik0sbba4hwr2r4vwiwb6kxscmx";
version = "2019.10.44104";
sha256 = "1k0wws430psrl8zp9ky5mifbg02qmh2brjyqk5k9pn3y1dks5gns";
};

buildInputs = [
4 changes: 2 additions & 2 deletions pkgs/misc/vscode-extensions/wakatime/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@ in
mktplcRef = {
name = "vscode-wakatime";
publisher = "WakaTime";
version = "2.2.0";
sha256 = "0mwn72cp8rd9zc527k9l08iyap1wyqzpvzbj8142fa7nsy64jd04";
version = "2.2.1";
sha256 = "18hdmx993wvhcv13z9p8ylp3lf480axv4lyl0qx52pw2y2jgj1z8";
};

postPatch = ''