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: edd63e05d1e3
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: 5e42ee936db7
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Aug 30, 2018

  1. xorg.libX11: 1.6.5 -> 1.6.6 (security) 

    CVE-2018-14598, CVE-2018-14599, CVE-2018-14600
https://lists.x.org/archives/xorg-announce/2018-August/002915.html

(cherry picked from commit cb44c3f)
    @vcunat
    vcunat committed Aug 30, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 43C9E53FFCF51DEC
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5e42ee9 View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −3 pkgs/servers/x11/xorg/default.nix
  2. +1 −1 pkgs/servers/x11/xorg/tarballs-7.7.list
6 changes: 3 additions & 3 deletions pkgs/servers/x11/xorg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -740,11 +740,11 @@ let
}) // {inherit windowswmproto libX11 libXext xextproto ;};

libX11 = (mkDerivation "libX11" {
name = "libX11-1.6.5";
name = "libX11-1.6.6";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2;
sha256 = "0pa3cfp6h9rl2vxmkph65250gfqyki0ccqyaan6bl9d25gdr0f2d";
url = mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2;
sha256 = "0ks1mxlda7nxfmffihi15ljsn50q8dknl33i2xag8xzc80fiizk5";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/tarballs-7.7.list
View file
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
mirror://xorg/individual/lib/libpciaccess-0.14.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2
mirror://xorg/individual/lib/libX11-1.6.6.tar.bz2
mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2
mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2