Skip to content

Commit

Permalink
xorg-server: major bump 1.14.* -> 1.16.1 (incl. deps)
Browse files Browse the repository at this point in the history
  • Loading branch information
@vcunat
vcunat committed Nov 5, 2014
1 parent 0a6bae1 commit dcd2590
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
22 changes: 11 additions & 11 deletions pkgs/servers/x11/xorg/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,11 +435,11 @@ let
}) // {inherit bdftopcf mkfontdir ;};

fontsproto = (mkDerivation "fontsproto" {
name = "fontsproto-2.1.2";
name = "fontsproto-2.1.3";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2;
sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746";
url = mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2;
sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415";
};
buildInputs = [pkgconfig ];
}) // {inherit ;};
Expand Down Expand Up @@ -705,11 +705,11 @@ let
}) // {inherit fixesproto libX11 xextproto xproto ;};

libXfont = (mkDerivation "libXfont" {
name = "libXfont-1.4.8";
name = "libXfont-1.5.0";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2;
sha256 = "01fh2hnnaby8x6mv57x78nsqwhls70gwykldzd8b43vrpzzd8s2m";
url = mirror://xorg/individual/lib/libXfont-1.5.0.tar.bz2;
sha256 = "0py2c498lrq6wrj9al6nj57v2ypid9cz0zzhc0hjndgrmp254g1s";
};
buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
}) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
Expand Down Expand Up @@ -1985,14 +1985,14 @@ let
}) // {inherit ;};

xorgserver = (mkDerivation "xorgserver" {
name = "xorg-server-1.14.7";
name = "xorg-server-1.16.1";
builder = ./builder.sh;
src = fetchurl {
url = mirror://xorg/individual/xserver/xorg-server-1.14.7.tar.bz2;
sha256 = "07s54g9q1bry1050dsa7x6hy55yjvq9sxs6ks89pc8l6mnk6zxpw";
url = mirror://xorg/individual/xserver/xorg-server-1.16.1.tar.bz2;
sha256 = "0q706wdbwipyfcvywl7apih3p5mrms3p0wr1hdj5jyzvr5p7qrzl";
};
buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
}) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ];
}) // {inherit renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;};

xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
name = "xorg-sgml-doctools-1.11";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/servers/x11/xorg/overrides.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ in
dmxproto /*libdmx not used*/ xf86vidmodeproto
recordproto libXext pixman libXfont
damageproto xcmiscproto bigreqsproto
libpciaccess inputproto xextproto randrproto renderproto
libpciaccess inputproto xextproto randrproto renderproto presentproto
dri2proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
];
commonPatches = [ ./xorgserver-xkbcomp-path.patch ];
Expand Down
6 changes: 3 additions & 3 deletions pkgs/servers/x11/xorg/tarballs-7.7.list
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2
Expand All @@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.0.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2
mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
Expand Down Expand Up @@ -171,7 +171,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.14.7.tar.bz2
mirror://xorg/individual/xserver/xorg-server-1.16.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
mirror://xorg/individual/app/xprop-1.2.2.tar.bz2
Expand Down

7 comments on commit dcd2590

@edolstra
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

xf86-video-intel no longer builds, which I'm guessing is caused by the X.org upgrade: http://hydra.nixos.org/build/16882143

Strangely, there is no newer stable version of xf86-video-intel, though there are some 2.99.* releases.

@vcunat
Copy link
Member Author

@vcunat vcunat commented on dcd2590 Nov 12, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I know about this. Most distros are using the pre-release 3.0 for a year at least. It's probably more stable than the ancient version. I already pushed the updating commit 515dcb0 to glibc-2.20 some time ago, as the old driver also had problems with the glibc update.

Should I cherry-pick it, or do you plan to merge the branch to staging very soon?

@edolstra
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, please cherry-pick. I want to merge the branch real soon and then merge the glibc/perl/bash stuff into the next staging branch.

@vcunat
Copy link
Member Author

@vcunat vcunat commented on dcd2590 Nov 12, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. Pushed. What about those many nixos tests failing due to DNS lookups? I glimpsed @lethalman claiming knowledge of the cause, but was it fixed/confirmed?

@edolstra
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The installer tests (which I guess you're referring to) are looking good: http://hydra.nixos.org/eval/1157609#tabs-now-succeed

@vcunat
Copy link
Member Author

@vcunat vcunat commented on dcd2590 Nov 12, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I didn't notice most of this evaluation was finished already. Looks good. I guess that the Apache misconfiguration is a master problem.

However, I don't like that firefox build problem. It's a link-time segfault on both platforms.

@domenkozar
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, this breaks ATI: #5266

Please sign in to comment.