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: 421314a934ee
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1601f559e89b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 14, 2019

  1. vscode: 1.35.0 -> 1.35.1 

    (cherry picked from commit 9ef46ec)
    @eadwu @worldofpeace
    eadwu authored and worldofpeace committed Jun 14, 2019
    Copy the full SHA
    0ff6b88 View commit details

  2. vscodium: 1.34.0 -> 1.35.1 

    (cherry picked from commit a8fb5cb)
    @eadwu @worldofpeace
    eadwu authored and worldofpeace committed Jun 14, 2019
    Copy the full SHA
    1601f55 View commit details
Showing with 9 additions and 9 deletions.
  1. +4 −4 pkgs/applications/editors/vscode/vscode.nix
  2. +5 −5 pkgs/applications/editors/vscode/vscodium.nix
8 changes: 4 additions & 4 deletions pkgs/applications/editors/vscode/vscode.nix
View file
Original file line number Diff line number Diff line change
@@ -12,14 +12,14 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";

sha256 = {
"i686-linux" = "1485maq7rrvi742w0zs5nnaqy2s7w4hhm0fi4n69vafncia8zyic";
"x86_64-linux" = "082725c7yzih13d4khvwz34ijwdg6yxmsxhjmpn2pqlfsg43hxsh";
"x86_64-darwin" = "1mvj63sbdcw227bi4idqcwqxds60g64spvdi2bxh5sk6g5q5df90";
"i686-linux" = "0345pxad3fkcmn5z2r55fnvx8ybvfpwydxv2h21rd99grhwh8dk4";
"x86_64-linux" = "1g6cib1c9mikg8cv940xk5g8dh0q5v6vlrgj78rr161hz1lrrv09";
"x86_64-darwin" = "0krihhr57hnsc9qc1l2ncg70vz7nmrvlqrjbgdnihlrpf71d09hp";
}.${system};
in
callPackage ./generic.nix rec {

version = "1.35.0";
version = "1.35.1";
pname = "vscode";

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

sha256 = {
"i686-linux" = "1vr3mblg5223k56yqi9fqwa7yg8qi4r3nkw6ssf87gs8jwfxa47l";
"x86_64-linux" = "1vqq365zw44ll22i06bxxviyywv1v2f71c2mricrz3faz25c3lvm";
"x86_64-darwin" = "0pa5cz8kq45q375b74kaa8qn1h0r1mp9amh5gsprg3hx89xzvhxi";
"i686-linux" = "0i572kxc7h63jxl6mw5k3gv08m9padqkky5k1f3w0d638hxhfl23";
"x86_64-linux" = "0577lqpfrjgwbj27hm59kflb558mkl2nx00ys0hwndayqv0bfnvg";
"x86_64-darwin" = "047sj0j9k74fvw9fc1ripqk2vy4v17jw488m7r95nf0cyyk08xg0";
}.${system};
in
callPackage ./generic.nix rec {

version = "1.34.0";
version = "1.35.1";
pname = "vscodium";

executableName = "vscodium";
executableName = "codium";
longName = "VSCodium";
shortName = "Codium";