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: ae5c5c068051
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: a4a4d2706ef3
Choose a head ref
14 contributors

Commits on Mar 24, 2018

  1. (misc) add myself to list of maintainers

    @ysndr
    ysndr committed Mar 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    rickie Rick Ossendrijver
    GPG key ID: A2237828CE7F76B2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7e61e7f View commit details

Commits on Mar 25, 2018

  1. (krunner-pass): init at version v1.3.0 

    (cherry picked from commit a2ba336585bcb3fa5f3b107230f094b69d3e91b2)
    @ysndr
    ysndr committed Mar 25, 2018
    Copy the full SHA
    eb89ca8 View commit details

Commits on Mar 27, 2018

  1. openssl_1_1_0: 1.1.0g -> 1.1.0h (fixes CVE-2018-0739, CVE-2017-3738) 

    Also fixes CVE-2018-0733 but we do not support HP-UX to my knowledge :-)

Announcement at [1].

[1] https://www.openssl.org/news/secadv/20180327.txt

(cherry picked from commit 7211032)
    @andir
    andir committed Mar 27, 2018
    Copy the full SHA
    33aedce View commit details

  2. openssl: 1.0.2n -> 1.0.2o (fixes CVE-2017-3738, CVE-2018-0739) 

    Announcement can be found at [1].

[1] https://www.openssl.org/news/secadv/20180327.txt

(cherry picked from commit 4bf9b4a)
    @andir
    andir committed Mar 27, 2018
    Copy the full SHA
    4e63b37 View commit details

  3. firefox-bin: 59.0.1 -> 59.0.2 

    Fixes MFSA2018-10 [1].

[1] https://www.mozilla.org/en-US/security/advisories/mfsa2018-10/

(cherry picked from commit 6abbe39)
    @andir
    andir committed Mar 27, 2018
    Copy the full SHA
    2a74e47 View commit details

  4. firefox-esr: 52.7.2esr -> 52.7.3esr 

    Fixes MFSA2018-10 [1].

[1] https://www.mozilla.org/en-US/security/advisories/mfsa2018-10/

(cherry picked from commit 24a2c3f)
    @andir
    andir committed Mar 27, 2018
    Copy the full SHA
    b23c467 View commit details

  5. firefox: 59.0.1 -> 59.0.2 

    (cherry picked from commit 73a7d67)
    @7c6f434c @andir
    7c6f434c authored and andir committed Mar 27, 2018
    Copy the full SHA
    4f9505f View commit details

Commits on Mar 28, 2018

  1. Merge pull request #37947 from andir/17.09/openssl 

    [17.09] openssl{,1_1_0} update (1.0.2o, 1.1.0h)
    @andir
    andir authored Mar 28, 2018
    Copy the full SHA
    a58c1ce View commit details

  2. Merge pull request #37963 from andir/17.09/firefox 

    [17.09] firefox{,-bin,-esr} updates for MFSA2018-10
    @fpletz
    fpletz authored Mar 28, 2018
    Copy the full SHA
    9282ad6 View commit details

  3. nixops: update to 1.6

    @rbvermaa
    rbvermaa committed Mar 28, 2018
    Copy the full SHA
    2a28e65 View commit details

  4. skypeforlinux: 8.17.0.2 -> 8.18.0.6 

    (cherry picked from commit f4b9da7)
(cherry picked from commit 1784c77)
    @dywedir @rycee
    dywedir authored and rycee committed Mar 28, 2018
    Copy the full SHA
    681926f View commit details

Commits on Mar 29, 2018

  1. gitlab test: fix eval 

    Still doesn't work, but better than before
    @globin
    globin committed Mar 29, 2018
    Copy the full SHA
    3410d73 View commit details

Commits on Mar 30, 2018

  1. nzbget: 19.0 -> 19.1

    @pSub
    pSub committed Mar 30, 2018
    Copy the full SHA
    b8c0cc4 View commit details

Commits on Apr 2, 2018

  1. Merge pull request #38331 from r-ryantm/auto-update/veracrypt 

    veracrypt: 1.21 -> 1.22
(cherry picked from commit cace501)
    @7c6f434c
    7c6f434c committed Apr 2, 2018
    Copy the full SHA
    2169304 View commit details

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

Commits on Apr 5, 2018

  1. aws-auth: unstable-2017-07-24 -> unstable-2018-04-04 

    also re-enable for continuity on stable branch. this (perhaps final) release
should at least *work* with the rest of release-17.09 but will probably
see no further development and should remain "dropped" in master.
    @risicle
    risicle committed Apr 5, 2018
    Copy the full SHA
    c86b179 View commit details

  2. Merge pull request #38457 from risicle/ris-aws-auth-r17.09-2 

    r17.09: aws-auth:  unstable-2017-07-24 -> unstable-2018-04-04
    @Mic92
    Mic92 authored Apr 5, 2018
    Copy the full SHA
    a611ddf View commit details

  3. nix: fix conditional so brotli is used w/2.0 builds, needed for logs! 

    cc NixOS/nix#1951

(cherry picked from commit 7dafa09)
    @dtzWill @edolstra
    dtzWill authored and edolstra committed Apr 5, 2018
    Copy the full SHA
    36864d2 View commit details

Commits on Apr 9, 2018

  1. Merge pull request #37804 from ysndr/backport/krunner-pass 

    (krunner-pass): init at 1.3.0 on 17.09
    @matthewbauer
    matthewbauer authored Apr 9, 2018
    Copy the full SHA
    a4a4d27 View commit details
1 change: 1 addition & 0 deletions lib/maintainers.nix
View file
Original file line number Diff line number Diff line change
@@ -658,6 +658,7 @@
ylwghst = "Burim Augustin Berisa <ylwghst@onionmail.info>";
yochai = "Yochai <yochai@titat.info>";
yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>";
ysndr = "Yannik Sander <me@ysndr.de>";
yuriaisaka = "Yuri Aisaka <yuri.aisaka+nix@gmail.com>";
yurrriq = "Eric Bailey <eric@ericb.me>";
z77z = "Marco Maggesi <maggesi@math.unifi.it>";
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;
8 changes: 7 additions & 1 deletion nixos/tests/gitlab.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,13 @@ import ./make-test.nix ({ pkgs, ...} : {
virtualisation.memorySize = 768;
services.gitlab.enable = true;
services.gitlab.databasePassword = "gitlab";
systemd.services.gitlab.serviceConfig.TimeoutStartSec = "10min";
services.gitlab.secrets = {
secret = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
db = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
jws = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
otp = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
};
systemd.services.gitlab.serviceConfig.TimeoutStartSec = "infinite";
};
};

4 changes: 2 additions & 2 deletions pkgs/applications/misc/veracrypt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
name = "veracrypt-${version}";
version = "1.21";
version = "1.22";

src = fetchurl {
url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2";
sha256 = "0n036znmwnv70wy8r2j3b55bx2z3cch5fr83vnwjvzyyp0j7swa4";
sha256 = "0w5qyxnx03vn93ach1kb995w2mdg43s82gf1isbk206sxp00qk4y";
};

unpackPhase =
Loading