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: 21693048d725
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: 4e9fa5cff3c3
Choose a head ref
  • 5 commits
  • 2 files changed
  • 4 contributors

Commits on Apr 4, 2018

  1. nixos/tests.chromium: actually notice the tab crash 

    Argh, debugging NixOS tests takes forever…
    @7c6f434c
    7c6f434c committed Apr 4, 2018
    Copy the full SHA
    1afb6e7 View commit details

  2. go: 1.9.2 -> 1.9.3 

    (cherry picked from commit f7dd695)
    @adisbladis @Mic92
    adisbladis authored and Mic92 committed Apr 4, 2018
    Copy the full SHA
    aa63817 View commit details

  3. go: Scale up test timeouts 

    I can't reproduce the problem on an idle machine where it finishes in
112.954s, so let's hope this works.

https://hydra.nixos.org/build/68236758
(cherry picked from commit 8f0508e)
    @dezgeg @Mic92
    dezgeg authored and Mic92 committed Apr 4, 2018
    Copy the full SHA
    121df5f View commit details

  4. go_1_9: 1.9.3 -> 1.9.4 

    (cherry picked from commit cac2a65)
    @adisbladis @Mic92
    adisbladis authored and Mic92 committed Apr 4, 2018
    Copy the full SHA
    357efa3 View commit details

  5. go_1_9: 1.9.4 -> 1.9.5 

    This is a maintenance bump of the golang 1.9 version.

Within the updates are a few bug fixes including an (extended?)
fix for CVE-2018-7187 [1].

The complete changelog is available at the golang GitHub project [2].

[1] https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7187
[2] https://github.com/golang/go/issues?q=milestone%3AGo1.9.5

(cherry picked from commit e9f74b9)
    @andir @Mic92
    andir authored and Mic92 committed Apr 4, 2018
    Copy the full SHA
    4e9fa5c View commit details
Showing with 26 additions and 4 deletions.
  1. +22 −2 nixos/tests/chromium.nix
  2. +4 −2 pkgs/development/compilers/go/1.9.nix
24 changes: 22 additions & 2 deletions nixos/tests/chromium.nix
View file
Original file line number Diff line number Diff line change
@@ -151,11 +151,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
$machine->screenshot("sandbox_info");
$machine->succeed(ru "${xdo "submit-url" ''
$machine->succeed(ru "${xdo "find-window" ''
search --sync --onlyvisible --name "sandbox status"
windowfocus --sync
''}");
$machine->succeed(ru "${xdo "submit-url" ''
$machine->succeed(ru "${xdo "copy-sandbox-info" ''
key --delay 1000 Ctrl+a Ctrl+c
''}");
@@ -166,6 +166,26 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
&& $clipboard =~ /network namespaces.*yes/mi
&& $clipboard =~ /seccomp.*sandbox.*yes/mi
&& $clipboard =~ /you are adequately sandboxed/mi;
$machine->sleep(1);
$machine->succeed(ru "${xdo "find-window-after-copy" ''
search --onlyvisible --name "sandbox status"
''}");
my $clipboard = $machine->succeed(ru "echo void | ${pkgs.xclip}/bin/xclip -i");
$machine->succeed(ru "${xdo "copy-sandbox-info" ''
key --delay 1000 Ctrl+a Ctrl+c
''}");
my $clipboard = $machine->succeed(ru "${pkgs.xclip}/bin/xclip -o");
die "copying twice in a row does not work properly: $clipboard"
unless $clipboard =~ /namespace sandbox.*yes/mi
&& $clipboard =~ /pid namespaces.*yes/mi
&& $clipboard =~ /network namespaces.*yes/mi
&& $clipboard =~ /seccomp.*sandbox.*yes/mi
&& $clipboard =~ /you are adequately sandboxed/mi;
$machine->screenshot("afer_copy_from_chromium");
};
$machine->shutdown;
6 changes: 4 additions & 2 deletions pkgs/development/compilers/go/1.9.nix
View file
Original file line number Diff line number Diff line change
@@ -25,13 +25,13 @@ in

stdenv.mkDerivation rec {
name = "go-${version}";
version = "1.9.2";
version = "1.9.5";

src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
sha256 = "07p4ld07r2nml2bsbfb8h51hqilbqyhhdlia99y1gk7ibvhybv8i";
sha256 = "15dx1b71xv7b265gqk9nv02pirggpw7d83apikhrza2qkj64ydd0";
};

# perl is used for testing go vet
@@ -142,6 +142,8 @@ stdenv.mkDerivation rec {
GO386 = 387; # from Arch: don't assume sse2 on i686
CGO_ENABLED = 1;
GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
# Hopefully avoids test timeouts on Hydra
GO_TEST_TIMEOUT_SCALE = 3;

# The go build actually checks for CC=*/clang and does something different, so we don't
# just want the generic `cc` here.