diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 5ce58e67c401..c1e274081ea2 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1100,11 +1100,11 @@ let })) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) { - name = "util-macros-1.18.0"; + name = "util-macros-1.19.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/util-macros-1.18.0.tar.bz2; - sha256 = "0nwlg1d4r23byncb3kar1a0mhjn52fc1m0ygl9p5gw2jm0rd3qz5"; + url = mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2; + sha256 = "1fnhpryf55l0yqajxn0cxan3kvsjzi67nlanz8clwqzf54cb2d98"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -2010,11 +2010,11 @@ let })) // {inherit ;}; xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) { - name = "xrandr-1.4.1"; + name = "xrandr-1.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrandr-1.4.1.tar.bz2; - sha256 = "0l0y4ifaqg90ibci276jvyawpj7ynzd8czsqxy5pfljnjymm9db7"; + url = mirror://xorg/individual/app/xrandr-1.4.2.tar.bz2; + sha256 = "1g4hnj53wknsjwiqivyy3jl4qw7jwrpncz7d5p2z29zq5zlnxrxj"; }; buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ]; })) // {inherit libX11 xproto libXrandr libXrender ;}; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 867e050bce05..3abfed675f83 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -6,4 +6,3 @@ http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 -http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 89ea4b956306..9de73701e82e 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -97,7 +97,7 @@ mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2 mirror://xorg/individual/app/sessreg-1.0.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/setxkbmap-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/smproxy-1.0.5.tar.bz2 -mirror://xorg/individual/util/util-macros-1.18.0.tar.bz2 +mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2 mirror://xorg/individual/proto/videoproto-2.3.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/x11perf-1.5.4.tar.bz2 @@ -175,7 +175,7 @@ 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 mirror://xorg/individual/proto/xproto-7.0.25.tar.bz2 -mirror://xorg/individual/app/xrandr-1.4.1.tar.bz2 +mirror://xorg/individual/app/xrandr-1.4.2.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 mirror://xorg/individual/app/xset-1.2.3.tar.bz2