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

Commits on Nov 14, 2020

  1. vscode: 1.48.2 -> 1.49.1 

    (cherry picked from commit d34dafc)
    @marsam
    upkeep-bot authored and marsam committed Nov 14, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2c36643 View commit details

  2. vscodium: 1.48.2 -> 1.49.1 

    (cherry picked from commit 0e6477d)
    @marsam
    upkeep-bot authored and marsam committed Nov 14, 2020
    Copy the full SHA
    d135469 View commit details

  3. vscode: 1.49.1 -> 1.49.3 

    (cherry picked from commit 234f8fb)
    @marsam
    upkeep-bot authored and marsam committed Nov 14, 2020
    Copy the full SHA
    51bd438 View commit details

  4. vscodium: 1.49.1 -> 1.49.3 

    (cherry picked from commit 0d4b52a)
    @marsam
    upkeep-bot authored and marsam committed Nov 14, 2020
    Copy the full SHA
    94bb0c2 View commit details

  5. vscode: 1.49.3 -> 1.50.0 

    (cherry picked from commit 3303b8a)
    @marsam
    upkeep-bot authored and marsam committed Nov 14, 2020
    Copy the full SHA
    f109b56 View commit details

  6. vscodium: 1.49.3 -> 1.50.0 

    (cherry picked from commit c29e980)
    @marsam
    upkeep-bot authored and marsam committed Nov 14, 2020
    Copy the full SHA
    da68dbc View commit details

  7. vscode, vscodium: 1.50.0 -> 1.50.1 

    (cherry picked from commit ffb7a61)
    @turion @marsam
    turion authored and marsam committed Nov 14, 2020
    Copy the full SHA
    b1d6c9d View commit details

  8. vscodium: 1.50.1 -> 1.51.0 

    (cherry picked from commit d8d1dc1)
    @marsam
    upkeep-bot authored and marsam committed Nov 14, 2020
    Copy the full SHA
    6d7b89f View commit details

  9. vscode: 1.50.1 -> 1.51.0 

    (cherry picked from commit 55fc82d)
    @marsam
    upkeep-bot authored and marsam committed Nov 14, 2020
    Copy the full SHA
    245cdfc View commit details

  10. vscodium: 1.51.0 -> 1.51.1 

    (cherry picked from commit bca0c78)
    @JesusMtnez @marsam
    JesusMtnez authored and marsam committed Nov 14, 2020
    Copy the full SHA
    8bdd825 View commit details

  11. vscode: 1.51.0 -> 1.51.1 

    (cherry picked from commit aa9a29c)
    @JesusMtnez @marsam
    JesusMtnez authored and marsam committed Nov 14, 2020
    Copy the full SHA
    7f5d9ec View commit details
Showing with 6 additions and 6 deletions.
  1. +3 −3 pkgs/applications/editors/vscode/vscode.nix
  2. +3 −3 pkgs/applications/editors/vscode/vscodium.nix
6 changes: 3 additions & 3 deletions pkgs/applications/editors/vscode/vscode.nix
View file
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

sha256 = {
x86_64-linux = "1i4vq8a81jgshn9iqkj8rp0yqihq2bjim27c8sh4vl9d6a8a6vcr";
x86_64-darwin = "090xj8pq3fdn7dcfrzvgvx906k6gs2xm04xkymz8vpm3a4rq1svn";
x86_64-linux = "0yv6584y4idkl9vvmpxj5ix5brshm1vadiwf7ima84snm0fipb0n";
x86_64-darwin = "0igndxkwkxyjc9rkf9hbj8903hvfv7ab41q0s3gw8w5qh4b8s48x";
}.${system};
in
callPackage ./generic.nix rec {
@@ -21,7 +21,7 @@ in

# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.48.2";
version = "1.51.1";
pname = "vscode";

executableName = "code" + lib.optionalString isInsiders "-insiders";
6 changes: 3 additions & 3 deletions pkgs/applications/editors/vscode/vscodium.nix
View file
Original file line number Diff line number Diff line change
@@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

sha256 = {
x86_64-linux = "17frdyli375l20mb7sb5bmw000p9cplj4pagmhnb6nibi9wqypdx";
x86_64-darwin = "1dh5k36fjdfwhidlsg1grjwy3s9jik3pg6xpdgi6946vzqv1vxll";
x86_64-linux = "0hn4pqmabz3qf3bbqnn1fz7fcgzdkp2lwr2yzgmx8hhh3cff8bnb";
x86_64-darwin = "1x3wx0d99ihyya0n89qclc3jlhh0m72hs8hj7l0h3z6zmh6q2vzv";
}.${system};

sourceRoot = {
@@ -27,7 +27,7 @@ in

# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
version = "1.48.2";
version = "1.51.1";
pname = "vscodium";

executableName = "codium";