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: 638fb3e3ce09
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 22075242d050
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 7, 2018

  1. vscode: 1.24.1 -> 1.25.0 

    Resolve missing lib, libgtk-x11-2.0.so.0
    @eadwu
    eadwu committed Jul 7, 2018

    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
    c020e74 View commit details

  2. Merge pull request #43132 from eadwu/vscode/1.25.0 

    vscode: 1.24.1 -> 1.25.0
    @infinisil
    infinisil authored Jul 7, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2207524 View commit details
Showing with 6 additions and 5 deletions.
  1. +6 −5 pkgs/applications/editors/vscode/default.nix
11 changes: 6 additions & 5 deletions pkgs/applications/editors/vscode/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem,
makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }:

let
version = "1.24.1";
version = "1.25.0";
channel = "stable";

plat = {
@@ -12,15 +12,16 @@ let
}.${stdenv.system};

sha256 = {
"i686-linux" = "189chqdimijjzydb8sp3yyi19fijsivyxrdddy8raaj7qkwq0maa";
"x86_64-linux" = "1944v54pfpfkq5jjnfrhndcwndsnvavd9qih1i2pq16mgaizmib2";
"x86_64-darwin" = "09sn22j40hax9v6ai99pfj67ymzkk82yqf8j33bg8byk4fgrz9jg";
"i686-linux" = "1dgn9swqax54pn5ykk97zdkkzyj46jambmnkb67cn44p29bw9s9m";
"x86_64-linux" = "0w2lzif7iilibvwhvg13gxarwz41qsb72s8hvj87mk5iqfdms1px";
"x86_64-darwin" = "08xhwvggflzh9lfc5s3jgrqb49yz4jdfii8sfq6v8w3c6yy8cdly";
}.${stdenv.system};

archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

rpath = lib.concatStringsSep ":" [
atomEnv.libPath
"${lib.makeLibraryPath [gtk2]}"
"${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0"
"${lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1"
"${lib.makeLibraryPath [libxkbfile]}/libxkbfile.so.1"