Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bdbf6311678d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e866ed8d325c
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 4, 2019

  1. xdm: 1.1.11 -> 1.1.12 (#56755) 

    https://lists.x.org/archives/xorg-announce/2019-March/002959.html
(cherry picked from commit 9809a54)

Fixes CVE-2013-2179
    @dtzWill @xeji
    dtzWill authored and xeji committed Mar 4, 2019
    Copy the full SHA
    e866ed8 View commit details
Showing with 6 additions and 6 deletions.
  1. +5 −5 pkgs/servers/x11/xorg/default.nix
  2. +1 −1 pkgs/servers/x11/xorg/tarballs.list
10 changes: 5 additions & 5 deletions pkgs/servers/x11/xorg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1599,16 +1599,16 @@ lib.makeScope newScope (self: with self; {
meta.platforms = stdenv.lib.platforms.unix;
}) {};

xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, libXt }: stdenv.mkDerivation {
name = "xdm-1.1.11";
xdm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXau, libXaw, libXdmcp, libXext, libXft, libXinerama, libXmu, libXpm, xorgproto, libXrender, libXt }: stdenv.mkDerivation {
name = "xdm-1.1.12";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/app/xdm-1.1.11.tar.bz2;
sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl";
url = mirror://xorg/individual/app/xdm-1.1.12.tar.bz2;
sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd";
};
hardeningDisable = [ "bindnow" "relro" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ];
buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ];
meta.platforms = stdenv.lib.platforms.unix;
}) {};

2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/tarballs.list
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2
mirror://xorg/individual/app/xcompmgr-1.1.7.tar.bz2
mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2
mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2
mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
mirror://xorg/individual/app/xdm-1.1.12.tar.bz2
mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2
mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2
mirror://xorg/individual/app/xev-1.2.2.tar.bz2