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

Commits on May 16, 2020

  1. vscode, vscodium: 1.44.1 -> 1.44.2 

    (cherry picked from commit ba774d4)
    @eadwu
    Roman Kuznetsov authored and eadwu committed May 16, 2020
    Copy the full SHA
    78a2877 View commit details

  2. vscode: 1.44.2 -> 1.45.0 

    (cherry picked from commit 301905d)
    @eadwu
    eadwu committed May 16, 2020
    Copy the full SHA
    44f95f4 View commit details

  3. vscodium: 1.44.2 -> 1.45.0 

    (cherry picked from commit 36fb04b)
    @eadwu
    eadwu committed May 16, 2020
    Copy the full SHA
    b33349c View commit details

  4. vscode: remove unused option 

    The option "--skip-getting-started" no longer exists in vscode and causes files in "$@" to not be opened.
Message from stdout: "Warning: 'skip-getting-started' is not in the list of known options, but still passed to Electron/Chromium."
"--skip-getting-started" being removed: microsoft/vscode@6a8b201

(cherry picked from commit f1e6d96)
    @rtldg @eadwu
    rtldg authored and eadwu committed May 16, 2020
    Copy the full SHA
    8396a9f View commit details

  5. vscodium: Fix .desktop file 

    (cherry picked from commit 91f58ec)
    @turion @eadwu
    turion authored and eadwu committed May 16, 2020
    Copy the full SHA
    9624df4 View commit details

Commits on May 17, 2020

  1. Merge pull request #87961 from eadwu/vscode/05-2020 

    vscode: 02/2020 backports
    @marsam
    marsam authored May 17, 2020
    Copy the full SHA
    025deb8 View commit details
Showing with 7 additions and 9 deletions.
  1. +0 −2 pkgs/applications/editors/vscode/generic.nix
  2. +3 −3 pkgs/applications/editors/vscode/vscode.nix
  3. +4 −4 pkgs/applications/editors/vscode/vscodium.nix
2 changes: 0 additions & 2 deletions pkgs/applications/editors/vscode/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -78,8 +78,6 @@ in
mkdir -p $out/lib/vscode $out/bin
cp -r ./* $out/lib/vscode
substituteInPlace $out/lib/vscode/bin/${executableName} --replace '"$CLI" "$@"' '"$CLI" "--skip-getting-started" "$@"'
ln -s $out/lib/vscode/bin/${executableName} $out/bin
mkdir -p $out/share/applications
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 = "15jg39hmlnicq0zrz77yar1bmn5y6gp2670dya2qm5klhva9hd0f";
x86_64-darwin = "1ghqhn46jpbj3is8q5zcj0biyc7gwinhiz3qdpcnf88ga2blcsz8";
x86_64-linux = "16zchjp72m6n6za4ak5kn2ax1s5pjfn7l082d6gfbb2y62isvs7q";
x86_64-darwin = "0w35s6nxagcnd6xcm6bp0m63agkqxffig61cr3nnmpbcgj9zc969";
}.${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.44.1";
version = "1.45.0";
pname = "vscode";

executableName = "code" + lib.optionalString isInsiders "-insiders";
8 changes: 4 additions & 4 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 = "16qwhnxpwarnwvlxwvy13g687g1cnfzysq16qkykkhqig0cnalmb";
x86_64-darwin = "1p9qkbj59bfc0kn9fzg99gqxbzwxq297qxivxcjflsapd712s4vm";
x86_64-linux = "1wb4s2jw90irlawgl6539gwl0xwaxglaksmbcddbvnr6rq3ypn8n";
x86_64-darwin = "16c1r7knfd5pfqhnk77nanh82azkc28pwkqfcyasbdgm70k17d3p";
}.${system};

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

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

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

src = fetchurl {
url = "https://github.com/VSCodium/vscodium/releases/download/${version}/VSCodium-${plat}-${version}.${archive_fmt}";