Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9779809e0509
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 69a482f640c5
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Oct 19, 2018

  1. tinc: remove unnecessary networking.interfaces 

    This breaks with networking backends enabled and
also creates large delays on boot when some services depends
on the network target. It is also not really required
because tinc does create those interfaces itself.

fixes #27070

(cherry picked from commit 5a1f0f9)
    @Mic92
    Mic92 committed Oct 19, 2018
    Copy the full SHA
    cde886e View commit details

  2. vscode: 1.26.1 -> 1.27.2 (#47397) 

    (cherry picked from commit 0d810c5)
    @bkchr @Mic92
    bkchr authored and Mic92 committed Oct 19, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d8649a8 View commit details

  3. vscode: 1.27.2 -> 1.28.0 

    (cherry picked from commit a396229)
    @eadwu @Mic92
    eadwu authored and Mic92 committed Oct 19, 2018

    Unverified

    The key that signed this doesn't have usage flags that allow signing.
    GPG key ID: 86E30E5A0F5FC59C
    Learn about vigilant mode
    Copy the full SHA
    a6d6477 View commit details

  4. vscode: 1.28.0 -> 1.28.2 

    (cherry picked from commit 8861eca)
    @eadwu @Mic92
    eadwu authored and Mic92 committed Oct 19, 2018
    Copy the full SHA
    69a482f View commit details
Showing with 4 additions and 12 deletions.
  1. +0 −8 nixos/modules/services/networking/tinc.nix
  2. +4 −4 pkgs/applications/editors/vscode/default.nix
8 changes: 0 additions & 8 deletions nixos/modules/services/networking/tinc.nix
View file
Original file line number Diff line number Diff line change
@@ -148,14 +148,6 @@ in
}
));

networking.interfaces = flip mapAttrs' cfg.networks (network: data: nameValuePair
("tinc.${network}")
({
virtual = true;
virtualType = "${data.interfaceType}";
})
);

systemd.services = flip mapAttrs' cfg.networks (network: data: nameValuePair
("tinc.${network}")
({
8 changes: 4 additions & 4 deletions pkgs/applications/editors/vscode/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }:

let
version = "1.26.1";
version = "1.28.2";
channel = "stable";

plat = {
@@ -12,9 +12,9 @@ let
}.${stdenv.hostPlatform.system};

sha256 = {
"i686-linux" = "1g7kqbz6mrf8ngx2bnwpi9fifq5rjznxgsgwjb532z3nh92ypa8n";
"x86_64-linux" = "02yldycakn5zxj1ji4nmhdyazqlkjqpzdj3g8j501c3j28pgiwjy";
"x86_64-darwin" = "0pnsfkh20mj7pzqw7wlfd98jqc6a1mnsq1iira15n7fafqgj8zpl";
"i686-linux" = "13zgx80qzq1wvss3byh56rvp2bdxywc4xmhhljsqrxf17g86g2zr";
"x86_64-linux" = "1z50hkr9mcf76hlr1jb80nbvpxbpm2bh0l63yh9yqpalmz66xbfy";
"x86_64-darwin" = "0n7lavpylg1q89qa64z4z1v7pgmwb2kidc57cgpvjnhjg8idys33";
}.${stdenv.hostPlatform.system};

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