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: ee80654b5267
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: 238554904f07
Choose a head ref
  • 5 commits
  • 10 files changed
  • 3 contributors

Commits on May 12, 2018

  1. xquartz: fix build 

    Things done:

- use libGLU instead of mesa for darwin support
- move patches from local to github url
- fixup xquartz install

There may still be some issues at runtime. PRs welcome!

Fixes #40196

(cherry picked from commit c839771)
    @matthewbauer @vcunat
    matthewbauer authored and vcunat committed May 12, 2018
    Copy the full SHA
    7e14bdc View commit details

Commits on May 18, 2018

  1. chromium: 66.0.3359.139 -> 66.0.3359.170 

    Update includes 4 security fixes, including one critical (see [0]):

* [835887] Critical: Chain leading to sandbox escape. Reported by Anonymous on 2018-04-23:
* [836858] High CVE-2018-6121: Privilege Escalation in extensions.
* [836141] High CVE-2018-6122: Type confusion in V8.
* [$5000][833721] High CVE-2018-6120: Heap buffer overflow in PDFium.  Reported by Zhou Aiting(@zhouat1) of Qihoo 360 Vulcan Team on 2018-04-17

[0] https://chromereleases.googleblog.com/2018/05/stable-channel-update-for-desktop.html

PS: Didn't build Beta and Dev, verified only Stable for now

cc @bendlas @aszlig

(cherry picked from commit 1837026)
    @YorikSar
    YorikSar committed May 18, 2018
    Copy the full SHA
    c6a5b16 View commit details

  2. chromium: 66.0.3359.170 -> 66.0.3359.181 

    (cherry picked from commit 2729875)
    @YorikSar
    YorikSar committed May 18, 2018
    Copy the full SHA
    fcea258 View commit details

Commits on May 19, 2018

  1. Merge #40718: chromium: 66.0.3359.139 -> 66.0.3359.181

    @vcunat
    vcunat committed May 19, 2018
    Copy the full SHA
    6d9aa78 View commit details

  2. Merge #40407: xquartz: fix build

    @vcunat
    vcunat committed May 19, 2018
    Copy the full SHA
    2385549 View commit details
18 changes: 9 additions & 9 deletions pkgs/applications/networking/browsers/chromium/upstream-info.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "136gx9qqbzfzaf19k0gxb8n4ypd4ycyr83i9v68nqdvy2k26vf4n";
sha256bin64 = "0w628afj5k4xygizlznwxkljgc1prxqc3lanaz6gdmyrl7gk1s7n";
version = "67.0.3396.18";
sha256 = "169lxj6rhpqcnrg3n2api82975hkifz6wmks1bh04jkxw0z2vkny";
sha256bin64 = "1hd4s35yhi2xidy3xncp66p03cv715bzbf3gcv5dl0d1h3nmhhdf";
version = "67.0.3396.40";
};
dev = {
sha256 = "1yspf0n385ail9qxsmax58mfk5yi473ygsraqs83q30pfgxc5z2f";
sha256bin64 = "1gi1xpnjwkg7sxv94ksv6fiymw13rxdq2hyvza8b9famvfcaz07j";
version = "68.0.3409.2";
sha256 = "0j4vcfbdj8cvdsmnb6pz0k71w559rm3ka1yyv0yfq7f756hinpvp";
sha256bin64 = "1qqhyjdd227psvr904w3d3lq47bfwmpk6f7sam2gp4j0wxn23w8w";
version = "68.0.3423.2";
};
stable = {
sha256 = "1ck4wbi28702p1lfs4sz894ysbgm7fj79wrqj8srsy65z2ssaxdy";
sha256bin64 = "1vgrgay3h0961vj96ql2p0pb16gzfr48r4hk25rxdqbflnz7njz0";
version = "66.0.3359.139";
sha256 = "06g9m7lxm9g63dcci25dqiglyjxjfy7v05vjhdda4rdk84vngrip";
sha256bin64 = "105ds6r6awzhf5sq3nf43b6zb84lb4qbhjnfk3fnxfqvskq3b6r2";
version = "66.0.3359.181";
};
}
41 changes: 0 additions & 41 deletions pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
View file

This file was deleted.

297 changes: 0 additions & 297 deletions pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
View file

This file was deleted.

Loading