From 9ace84df758b0cd639d2f33d849c9c32be6ac406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Mar 2014 23:12:30 +0100 Subject: [PATCH 01/20] libxklavier: update 5.0 -> 5.3 (after a long time) --- pkgs/development/libraries/libxklavier/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index ac5c6146cbae..cb3c3b23e7f8 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,12 +1,15 @@ { stdenv, fetchurl, pkgconfig, libX11, libXi, xkeyboard_config, libxml2 , libICE, glib, libxkbfile, isocodes }: +let + version = "5.3"; +in stdenv.mkDerivation rec { - name = "libxklavier-5.0"; + name = "libxklavier-${version}"; src = fetchurl { - url = "mirror://sourceforge/gswitchit/${name}.tar.bz2"; - sha256 = "1c2dxinjfpq1lzxi0z46r0j80crbmwb0lkvnh6987cjjlwblpnfz"; + url = "mirror://gnome/sources/libxklavier/${version}/${name}.tar.xz"; + sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"; }; # TODO: enable xmodmap support, needs xmodmap DB From 23682d02d0031a9636f320d16659712d2ad8121b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 14 Mar 2014 12:31:09 +0100 Subject: [PATCH 02/20] xorg: update, regenerate (new: glamor-egl) Updates caught by nixpkgs monitor. --- pkgs/servers/x11/xorg/default.nix | 332 ++++++++++++------------ pkgs/servers/x11/xorg/old.list | 10 +- pkgs/servers/x11/xorg/tarballs-7.7.list | 83 +++--- 3 files changed, 218 insertions(+), 207 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6990da2352ed..277914294187 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -20,11 +20,11 @@ let })) // {inherit ;}; bdftopcf = (stdenv.mkDerivation ((if overrides ? bdftopcf then overrides.bdftopcf else x: x) { - name = "bdftopcf-1.0.3"; + name = "bdftopcf-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/bdftopcf-1.0.3.tar.bz2; - sha256 = "02hx981f7jfwylxj21s91yvv4h597nqqzz3vd6ar81zyn84b944w"; + url = mirror://xorg/individual/app/bdftopcf-1.0.4.tar.bz2; + sha256 = "1617zmgnx50n7vxlqyj84fl7vnk813jjqmi6jpigyz1xp9br1xga"; }; buildInputs = [pkgconfig libXfont ]; })) // {inherit libXfont ;}; @@ -489,32 +489,42 @@ let buildInputs = [pkgconfig ]; })) // {inherit ;}; - glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) { - name = "glproto-1.4.16"; + glamoregl = (stdenv.mkDerivation ((if overrides ? glamoregl then overrides.glamoregl else x: x) { + name = "glamor-egl-0.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/glproto-1.4.16.tar.bz2; - sha256 = "13arnb4bz5pn89bxbh3shr8gihkhyznpjnq3zzr05msygwx6dpal"; + url = mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2; + sha256 = "1jg5clihklb9drh1jd7nhhdsszla6nv7xmbvm8yvakh5wrb1nlv6"; + }; + buildInputs = [pkgconfig dri2proto xorgserver ]; + })) // {inherit dri2proto xorgserver ;}; + + glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) { + name = "glproto-1.4.17"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2; + sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; iceauth = (stdenv.mkDerivation ((if overrides ? iceauth then overrides.iceauth else x: x) { - name = "iceauth-1.0.5"; + name = "iceauth-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/iceauth-1.0.5.tar.bz2; - sha256 = "1aq6v671s2x5rc6zn0rgxb4wddg4vq94mckw3cpwl7ccrjjvd5hl"; + url = mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2; + sha256 = "1x72y99dxf2fxnlyf0yrf9yzd8xzimxshy6l8mprwhrv6lvhi6dx"; }; buildInputs = [pkgconfig libICE xproto ]; })) // {inherit libICE xproto ;}; imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) { - name = "imake-1.0.5"; + name = "imake-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/imake-1.0.5.tar.bz2; - sha256 = "1h8ww97aymm10l9qn21n1b9x5ypjrqr10qpf48jjcbc9fg77gklr"; + url = mirror://xorg/individual/util/imake-1.0.6.tar.bz2; + sha256 = "1786k6jsazpr37v2b6qlsznjjp5lgyb869hx5m4ahax7n3yq72gs"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; @@ -570,11 +580,11 @@ let })) // {inherit xproto xtrans ;}; libSM = (stdenv.mkDerivation ((if overrides ? libSM then overrides.libSM else x: x) { - name = "libSM-1.2.1"; + name = "libSM-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2; - sha256 = "07bzi6xwlhq36f60qfspjbz0qjj7zcgayi1vp4ihgx34kib1vhck"; + url = mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2; + sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b"; }; buildInputs = [pkgconfig libICE libuuid xproto xtrans ]; })) // {inherit libICE libuuid xproto xtrans ;}; @@ -590,11 +600,11 @@ let })) // {inherit windowswmproto libX11 libXext xextproto ;}; libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) { - name = "libX11-1.6.1"; + name = "libX11-1.6.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libX11-1.6.1.tar.bz2; - sha256 = "14hqf180dxax3xf65bq95psd4bx8az1q1l6lxsjzbd2qdg0lz98h"; + url = mirror://xorg/individual/lib/libX11-1.6.2.tar.bz2; + sha256 = "05mx0s0vqzds3qjc1gmjr2s6x2ll37z4lfhgm7p2w7936zl2g81a"; }; buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;}; @@ -610,31 +620,31 @@ let })) // {inherit scrnsaverproto libX11 libXext xextproto ;}; libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) { - name = "libXau-1.0.7"; + name = "libXau-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2; - sha256 = "12d4f7sdv2pjxhk0lcay0pahccddszkw579dc59daqi37r8bllvi"; + url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2; + sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; libXaw = (stdenv.mkDerivation ((if overrides ? libXaw then overrides.libXaw else x: x) { - name = "libXaw-1.0.11"; + name = "libXaw-1.0.12"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2; - sha256 = "14ll7ndf5njc30hz2w197qvwp7fqj7y14wq4p1cyxlbipfn79a47"; + url = mirror://xorg/individual/lib/libXaw-1.0.12.tar.bz2; + sha256 = "1xnv7jy86j9vhmw74frkzcraynqbw1p1s79jasargsgwfi433z4n"; }; buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ]; })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;}; libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) { - name = "libXcomposite-0.4.3"; + name = "libXcomposite-0.4.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2; - sha256 = "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j"; + url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2; + sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd"; }; buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ]; })) // {inherit compositeproto libX11 libXfixes xproto ;}; @@ -650,11 +660,11 @@ let })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; libXdamage = (stdenv.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) { - name = "libXdamage-1.1.3"; + name = "libXdamage-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2; - sha256 = "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw"; + url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2; + sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw"; }; buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ]; })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;}; @@ -730,11 +740,11 @@ let })) // {inherit libX11 libXext xextproto xineramaproto ;}; libXmu = (stdenv.mkDerivation ((if overrides ? libXmu then overrides.libXmu else x: x) { - name = "libXmu-1.1.1"; + name = "libXmu-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2; - sha256 = "1pbym8rrznxqd60zwf7w4xpf27sa72bky2knginqcfnca32q343h"; + url = mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2; + sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm"; }; buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; })) // {inherit libX11 libXext xextproto xproto libXt ;}; @@ -750,21 +760,21 @@ let })) // {inherit printproto libX11 libXau libXext xextproto ;}; libXpm = (stdenv.mkDerivation ((if overrides ? libXpm then overrides.libXpm else x: x) { - name = "libXpm-3.5.10"; + name = "libXpm-3.5.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXpm-3.5.10.tar.bz2; - sha256 = "0dd737ch4q9gr151wff1m3q2j7wf3pip4y81601xdrsh8wipxnx6"; + url = mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2; + sha256 = "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5"; }; buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ]; })) // {inherit libX11 libXext xextproto xproto libXt ;}; libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) { - name = "libXrandr-1.4.1"; + name = "libXrandr-1.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrandr-1.4.1.tar.bz2; - sha256 = "01dr1wvyxq2y4yq4hilgglkjlvn551dmnl4l65nfm8nh1x4s056r"; + url = mirror://xorg/individual/lib/libXrandr-1.4.2.tar.bz2; + sha256 = "1b95p3l84ppv6j7dbbmg0zrz6k8xdwvnag1l6ajm3gk9qwdb79ya"; }; buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; @@ -810,11 +820,11 @@ let })) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; libXv = (stdenv.mkDerivation ((if overrides ? libXv then overrides.libXv else x: x) { - name = "libXv-1.0.8"; + name = "libXv-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXv-1.0.8.tar.bz2; - sha256 = "1mvkmypf9rsr3lr161hf9sjadlirb116jfp5lk70j29r8x9yn02g"; + url = mirror://xorg/individual/lib/libXv-1.0.10.tar.bz2; + sha256 = "09a5j6bisysiipd0nw6s352565bp0n6gbyhv5hp63s3cd3w95zjm"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ]; })) // {inherit videoproto libX11 libXext xextproto xproto ;}; @@ -870,11 +880,11 @@ let })) // {inherit dmxproto libX11 libXext xextproto ;}; libfontenc = (stdenv.mkDerivation ((if overrides ? libfontenc then overrides.libfontenc else x: x) { - name = "libfontenc-1.1.1"; + name = "libfontenc-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2; - sha256 = "0zq1483xy31sssq0h3xxf8y1v4q14cp8rv164ayn7fsn30pq2wny"; + url = mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2; + sha256 = "0qign0ivqk166l9yfd51gw9lbhgs718bcrmvc40yicjr6gnyz959"; }; buildInputs = [pkgconfig xproto zlib ]; })) // {inherit xproto zlib ;}; @@ -950,11 +960,11 @@ let })) // {inherit libfontenc ;}; makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) { - name = "makedepend-1.0.4"; + name = "makedepend-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/makedepend-1.0.4.tar.bz2; - sha256 = "1zpp2b9dfvlnfj2i1mzdyn785rpl7vih5lap7kcpiv80xspbhmmb"; + url = mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2; + sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; @@ -970,11 +980,11 @@ let })) // {inherit ;}; mkfontscale = (stdenv.mkDerivation ((if overrides ? mkfontscale then overrides.mkfontscale else x: x) { - name = "mkfontscale-1.1.0"; + name = "mkfontscale-1.1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/mkfontscale-1.1.0.tar.bz2; - sha256 = "1539h3ws66vcql6sf2831bcs0r4d9b05lcgpswkw33lvcxighmff"; + url = mirror://xorg/individual/app/mkfontscale-1.1.1.tar.bz2; + sha256 = "0cdpn1ii2iw1vg2ga4w62acrh78gzgf0vza4g8wx5kkp4jcifh14"; }; buildInputs = [pkgconfig libfontenc freetype xproto zlib ]; })) // {inherit libfontenc freetype xproto zlib ;}; @@ -1050,11 +1060,11 @@ let })) // {inherit ;}; sessreg = (stdenv.mkDerivation ((if overrides ? sessreg then overrides.sessreg else x: x) { - name = "sessreg-1.0.7"; + name = "sessreg-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/sessreg-1.0.7.tar.bz2; - sha256 = "0lifgjxdvc6lwyjk90slddnr12fsv88ldy6qhklr5av409cfwd47"; + url = mirror://xorg/individual/app/sessreg-1.0.8.tar.bz2; + sha256 = "1hy4wvgawajf4qw2k51fkcjzxw0drx60ydzpmqhj7k1g4z3cqahf"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; @@ -1080,31 +1090,31 @@ let })) // {inherit libICE libSM libXmu libXt ;}; twm = (stdenv.mkDerivation ((if overrides ? twm then overrides.twm else x: x) { - name = "twm-1.0.7"; + name = "twm-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/twm-1.0.7.tar.bz2; - sha256 = "0i6dbf5vafi5hm4bcmnj6r412cncjlv9hkkbr6bzlh15qvg56p8g"; + url = mirror://xorg/individual/app/twm-1.0.8.tar.bz2; + sha256 = "0i1ff8h2gh1ab311da5dlhl0nrma0qbrk403ymzi4cnnacikaq3n"; }; buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ]; })) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;}; utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) { - name = "util-macros-1.17"; + name = "util-macros-1.18.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/util-macros-1.17.tar.bz2; - sha256 = "1vbmrcn5n3wp4pyw0n4c3pyvzlc4yf7jzgngavfdq5zwfbgfsybx"; + url = mirror://xorg/individual/util/util-macros-1.18.0.tar.bz2; + sha256 = "0nwlg1d4r23byncb3kar1a0mhjn52fc1m0ygl9p5gw2jm0rd3qz5"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; videoproto = (stdenv.mkDerivation ((if overrides ? videoproto then overrides.videoproto else x: x) { - name = "videoproto-2.3.1"; + name = "videoproto-2.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2; - sha256 = "0nk3i6gwkqq1w8zwn7bxz344pi1dwcjrmf6hr330h7hxjcj6viry"; + url = mirror://xorg/individual/proto/videoproto-2.3.2.tar.bz2; + sha256 = "1dnlkd9nb0m135lgd6hd61vc29sdyarsyya8aqpx7z10p261dbld"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -1130,21 +1140,21 @@ let })) // {inherit libX11 libXext libXft libXmu libXrender ;}; xauth = (stdenv.mkDerivation ((if overrides ? xauth then overrides.xauth else x: x) { - name = "xauth-1.0.7"; + name = "xauth-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2; - sha256 = "1382wdfiakgckbw1xxavzh1nm34q21b1zzy96qp7ws66xc48rxw4"; + url = mirror://xorg/individual/app/xauth-1.0.8.tar.bz2; + sha256 = "1xylgy7qrf8w76gg1sa6x8ckv14q1nv0h554ndgrss8clpknlsd8"; }; - buildInputs = [pkgconfig libX11 libXau libXext libXmu ]; - })) // {inherit libX11 libXau libXext libXmu ;}; + buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ]; + })) // {inherit libX11 libXau libXext libXmu xproto ;}; xbacklight = (stdenv.mkDerivation ((if overrides ? xbacklight then overrides.xbacklight else x: x) { - name = "xbacklight-1.2.0"; + name = "xbacklight-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2; - sha256 = "199n9qszjiz82nbjz6ychh0xl15igm535mv0830wk4m59w9xclji"; + url = mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2; + sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp"; }; buildInputs = [pkgconfig libxcb xcbutil ]; })) // {inherit libxcb xcbutil ;}; @@ -1220,14 +1230,14 @@ let })) // {inherit gperf m4 libxcb xproto ;}; xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) { - name = "xclock-1.0.6"; + name = "xclock-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xclock-1.0.6.tar.bz2; - sha256 = "1l1zxr69p0734fnx9rdqw79ahr273hr050sm8xdc0n51n1bnzfr1"; + url = mirror://xorg/individual/app/xclock-1.0.7.tar.bz2; + sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3"; }; - buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu libXrender libXt ]; - })) // {inherit libX11 libXaw libXft libxkbfile libXmu libXrender libXt ;}; + buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ]; + })) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;}; xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) { name = "xcmiscproto-1.2.2"; @@ -1260,11 +1270,11 @@ let })) // {inherit libpng libX11 libXcursor ;}; xcursorthemes = (stdenv.mkDerivation ((if overrides ? xcursorthemes then overrides.xcursorthemes else x: x) { - name = "xcursor-themes-1.0.3"; + name = "xcursor-themes-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xcursor-themes-1.0.3.tar.bz2; - sha256 = "1is4bak0qkkhv63mfa5l7492r475586y52yzfxyv3psppn662ilr"; + url = mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2; + sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3"; }; buildInputs = [pkgconfig libXcursor ]; })) // {inherit libXcursor ;}; @@ -1280,14 +1290,14 @@ let })) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;}; xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) { - name = "xdpyinfo-1.3.0"; + name = "xdpyinfo-1.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xdpyinfo-1.3.0.tar.bz2; - sha256 = "0gypsvpmay3lsh3b1dg29pjxv95pkrr21d4w6ys02mrbld24kvi3"; + url = mirror://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2; + sha256 = "154b29zlrq33lmni883jgwyrb2kx7z8h52jx1s3ys5x5d582iydf"; }; - buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; - })) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; + buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; + })) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;}; xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) { name = "xdriinfo-1.0.4"; @@ -1300,11 +1310,11 @@ let })) // {inherit glproto libX11 ;}; xev = (stdenv.mkDerivation ((if overrides ? xev then overrides.xev else x: x) { - name = "xev-1.2.0"; + name = "xev-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xev-1.2.0.tar.bz2; - sha256 = "13xk5z7vy87rnn4574z0jfzymdivyc7pl4axim81sx0pmdysg1ip"; + url = mirror://xorg/individual/app/xev-1.2.1.tar.bz2; + sha256 = "0hv296mysglcgkx6lj1wxc23kshb2kix1a8yqppxj5vz16mpzw8i"; }; buildInputs = [pkgconfig libX11 xproto libXrandr ]; })) // {inherit libX11 xproto libXrandr ;}; @@ -1400,11 +1410,11 @@ let })) // {inherit inputproto xorgserver xproto ;}; xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) { - name = "xf86-input-synaptics-1.7.3"; + name = "xf86-input-synaptics-1.7.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.3.tar.bz2; - sha256 = "1m9j5shypv3dmxxfxjcmj01glay4gqqlchxqav89a4cn8ch9falb"; + url = mirror://xorg/individual/driver/xf86-input-synaptics-1.7.4.tar.bz2; + sha256 = "1xssjj0qxarzsc4m69ay5ydkwgq27qajzih2c7sjk7nkgggx58jn"; }; buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ]; })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;}; @@ -1460,14 +1470,14 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) { - name = "xf86-video-ati-7.2.0"; + name = "xf86-video-ati-7.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.2.0.tar.bz2; - sha256 = "1i5fknbbhynl5hv2dzznzcf0yadpm28jzvx7xl38vlfpr3ymw3zk"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.3.0.tar.bz2; + sha256 = "1zj6401km2zgc32vhw7jfkaklsllsm9xpbs79zh9da8r94n0fz0h"; }; - buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; - })) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + })) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) { name = "xf86-video-cirrus-1.5.2"; @@ -1546,8 +1556,8 @@ let url = mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2; sha256 = "1z6ncmpszmwqi9xr590c4kp4gjjf7mndcr56r35x2bx7h87i8nkx"; }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ]; - })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;}; + buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ]; + })) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;}; xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { name = "xf86-video-mach64-6.9.4"; @@ -1800,14 +1810,14 @@ let })) // {inherit libX11 libXxf86vm ;}; xhost = (stdenv.mkDerivation ((if overrides ? xhost then overrides.xhost else x: x) { - name = "xhost-1.0.5"; + name = "xhost-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xhost-1.0.5.tar.bz2; - sha256 = "0l483y6wfrjh37j16b41kpi2nc7ss5rvndafpbaylrs87ygx2w18"; + url = mirror://xorg/individual/app/xhost-1.0.6.tar.bz2; + sha256 = "1hlxm0is9nks1cx033s1733kkib9ivx2bxa3pb9yayqavwibkxd6"; }; - buildInputs = [pkgconfig libX11 libXau libXmu ]; - })) // {inherit libX11 libXau libXmu ;}; + buildInputs = [pkgconfig libX11 libXau libXmu xproto ]; + })) // {inherit libX11 libXau libXmu xproto ;}; xineramaproto = (stdenv.mkDerivation ((if overrides ? xineramaproto then overrides.xineramaproto else x: x) { name = "xineramaproto-1.2.1"; @@ -1820,21 +1830,21 @@ let })) // {inherit ;}; xinit = (stdenv.mkDerivation ((if overrides ? xinit then overrides.xinit else x: x) { - name = "xinit-1.3.2"; + name = "xinit-1.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xinit-1.3.2.tar.bz2; - sha256 = "0d821rlqwyn2js7bkzicyp894n9gqv1hahxs285pas1zm3d7z1m1"; + url = mirror://xorg/individual/app/xinit-1.3.3.tar.bz2; + sha256 = "1bq0mqy7y305g2rds1g5443f3d2kgxzafqhmiyabbmg3ws6qgckl"; }; - buildInputs = [pkgconfig libX11 ]; - })) // {inherit libX11 ;}; + buildInputs = [pkgconfig libX11 xproto ]; + })) // {inherit libX11 xproto ;}; xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) { - name = "xinput-1.6.0"; + name = "xinput-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2; - sha256 = "0zl4cdgnzh9shz20yn7hz889v4nkbyqwx0nb7dh6arn7abchgc2a"; + url = mirror://xorg/individual/app/xinput-1.6.1.tar.bz2; + sha256 = "07w7zlpdhpwzzshg8q0y152cy3wl2fj7x1897glnp2la487jsqxp"; }; buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ]; })) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; @@ -1860,11 +1870,11 @@ let })) // {inherit libX11 libxkbfile ;}; xkbutils = (stdenv.mkDerivation ((if overrides ? xkbutils then overrides.xkbutils else x: x) { - name = "xkbutils-1.0.3"; + name = "xkbutils-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2; - sha256 = "1ga913pw6chssf2016kjyjl6ar2lj83pa497w97ak2kq603sy2g4"; + url = mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2; + sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; }; buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ]; })) // {inherit inputproto libX11 libXaw xproto libXt ;}; @@ -1880,14 +1890,14 @@ let })) // {inherit libX11 xproto ;}; xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) { - name = "xkill-1.0.3"; + name = "xkill-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2; - sha256 = "1ac110qbb9a4x1dim3vaghvdk3jc708i2p3f4rmag33458khg0xx"; + url = mirror://xorg/individual/app/xkill-1.0.4.tar.bz2; + sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8"; }; - buildInputs = [pkgconfig libX11 libXmu ]; - })) // {inherit libX11 libXmu ;}; + buildInputs = [pkgconfig libX11 libXmu xproto ]; + })) // {inherit libX11 libXmu xproto ;}; xlsatoms = (stdenv.mkDerivation ((if overrides ? xlsatoms then overrides.xlsatoms else x: x) { name = "xlsatoms-1.1.1"; @@ -1900,11 +1910,11 @@ let })) // {inherit libxcb ;}; xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) { - name = "xlsclients-1.1.2"; + name = "xlsclients-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2; - sha256 = "1l97j15mg4wfzpm81wlpzagfjff7v4fwn7s2z2rpksk3gfcg7r8w"; + url = mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2; + sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx"; }; buildInputs = [pkgconfig libxcb ]; })) // {inherit libxcb ;}; @@ -1920,21 +1930,21 @@ let })) // {inherit libXaw libXt ;}; xmodmap = (stdenv.mkDerivation ((if overrides ? xmodmap then overrides.xmodmap else x: x) { - name = "xmodmap-1.0.7"; + name = "xmodmap-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2; - sha256 = "1dg47lay4vhrl9mfq3cfc6741a0m2n8wd4ljagd21ix3qklys8pg"; + url = mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2; + sha256 = "1hwzm54m4ng09ls9i4bq0x84zbyhamgzasgrvhxxp8jqk34f7qpg"; }; buildInputs = [pkgconfig libX11 xproto ]; })) // {inherit libX11 xproto ;}; xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) { - name = "xorg-cf-files-1.0.4"; + name = "xorg-cf-files-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/xorg-cf-files-1.0.4.tar.bz2; - sha256 = "0s86h66b3w4623m88fg2csp41cnr08qc8i3gkj85k3wpwj1wxs9n"; + url = mirror://xorg/individual/util/xorg-cf-files-1.0.5.tar.bz2; + sha256 = "1m3ypq0xcy46ghxc0svl1rbhpy3zvgmy0aa2mn7w7v7d8d8bh8zd"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -1980,61 +1990,61 @@ let })) // {inherit libX11 libXmu xproto ;}; xprop = (stdenv.mkDerivation ((if overrides ? xprop then overrides.xprop else x: x) { - name = "xprop-1.2.1"; + name = "xprop-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2; - sha256 = "18zi2any13zlb7f34fzyw6lkiwkd6k2scp3b800a1f4rj0c7m407"; + url = mirror://xorg/individual/app/xprop-1.2.2.tar.bz2; + sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv"; }; buildInputs = [pkgconfig libX11 xproto ]; })) // {inherit libX11 xproto ;}; xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) { - name = "xproto-7.0.23"; + name = "xproto-7.0.25"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xproto-7.0.23.tar.bz2; - sha256 = "17lkmi12f89qvg4jj5spqzwzc24fmsqq68dv6kpy7r7b944lmq5d"; + url = mirror://xorg/individual/proto/xproto-7.0.25.tar.bz2; + sha256 = "1zh977hrfxxdyhlxr9qjfa2xl8qrb4v43a2b708kdz2gvj2p894j"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) { - name = "xrandr-1.3.5"; + name = "xrandr-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xrandr-1.3.5.tar.bz2; - sha256 = "03lq1c1q4w5cf2ijs4b34v008lshibha9zv5lw08xpyhk9xgyn8h"; + url = mirror://xorg/individual/app/xrandr-1.4.1.tar.bz2; + sha256 = "0l0y4ifaqg90ibci276jvyawpj7ynzd8czsqxy5pfljnjymm9db7"; }; buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ]; })) // {inherit libX11 xproto libXrandr libXrender ;}; xrdb = (stdenv.mkDerivation ((if overrides ? xrdb then overrides.xrdb else x: x) { - name = "xrdb-1.0.9"; + name = "xrdb-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xrdb-1.0.9.tar.bz2; - sha256 = "1dza5a34nj68fzhlgwf18i5bk0n24ig28yihwpjy7vwn57hh2934"; + url = mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2; + sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk"; }; - buildInputs = [pkgconfig libX11 libXmu ]; - })) // {inherit libX11 libXmu ;}; + buildInputs = [pkgconfig libX11 libXmu xproto ]; + })) // {inherit libX11 libXmu xproto ;}; xrefresh = (stdenv.mkDerivation ((if overrides ? xrefresh then overrides.xrefresh else x: x) { - name = "xrefresh-1.0.4"; + name = "xrefresh-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xrefresh-1.0.4.tar.bz2; - sha256 = "0ywxzwa4kmnnmf8idr8ssgcil9xvbhnk155zpsh2i8ay93mh5586"; + url = mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2; + sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj"; }; - buildInputs = [pkgconfig libX11 ]; - })) // {inherit libX11 ;}; + buildInputs = [pkgconfig libX11 xproto ]; + })) // {inherit libX11 xproto ;}; xset = (stdenv.mkDerivation ((if overrides ? xset then overrides.xset else x: x) { - name = "xset-1.2.2"; + name = "xset-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xset-1.2.2.tar.bz2; - sha256 = "1s61mvscd0h7y6anljarj7nkii6plhs8ndx1fm8b1f1h00a1qdv1"; + url = mirror://xorg/individual/app/xset-1.2.3.tar.bz2; + sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3"; }; buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ]; })) // {inherit libX11 libXext libXmu xproto libXxf86misc ;}; @@ -2060,31 +2070,31 @@ let })) // {inherit ;}; xvinfo = (stdenv.mkDerivation ((if overrides ? xvinfo then overrides.xvinfo else x: x) { - name = "xvinfo-1.1.1"; + name = "xvinfo-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xvinfo-1.1.1.tar.bz2; - sha256 = "119rd93d7661ll1rfcdssn78l0b97326smziyr2f5wdwj2hlmiv0"; + url = mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2; + sha256 = "1qsh7fszi727l3vwlaf9pb7bpikdv15smrx5qhlgg3kqzl7xklzf"; }; - buildInputs = [pkgconfig libX11 libXv ]; - })) // {inherit libX11 libXv ;}; + buildInputs = [pkgconfig libX11 xproto libXv ]; + })) // {inherit libX11 xproto libXv ;}; xwd = (stdenv.mkDerivation ((if overrides ? xwd then overrides.xwd else x: x) { - name = "xwd-1.0.5"; + name = "xwd-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xwd-1.0.5.tar.bz2; - sha256 = "0fkg6msy2zg7rda2rpxb7j6vmrdmqmk72xsxnyhz97196ykjnx82"; + url = mirror://xorg/individual/app/xwd-1.0.6.tar.bz2; + sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv"; }; buildInputs = [pkgconfig libX11 xproto ]; })) // {inherit libX11 xproto ;}; xwininfo = (stdenv.mkDerivation ((if overrides ? xwininfo then overrides.xwininfo else x: x) { - name = "xwininfo-1.1.2"; + name = "xwininfo-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xwininfo-1.1.2.tar.bz2; - sha256 = "0fmcr5yl03xw7m8p9h1rk67rrj7gp5x16a547xhmg8idw2f6r9lg"; + url = mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2; + sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1"; }; buildInputs = [pkgconfig libX11 libxcb xproto ]; })) // {inherit libX11 libxcb xproto ;}; diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index 68c88594932b..7019273dd11a 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -1,15 +1,15 @@ -mirror://xorg/individual/app/twm-1.0.7.tar.bz2 -mirror://xorg/individual/app/xclock-1.0.6.tar.bz2 +mirror://xorg/individual/app/twm-1.0.8.tar.bz2 +mirror://xorg/individual/app/xclock-1.0.7.tar.bz2 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2 mirror://xorg/individual/app/xfs-1.1.3.tar.bz2 -mirror://xorg/individual/app/xinit-1.3.2.tar.bz2 +mirror://xorg/individual/app/xinit-1.3.3.tar.bz2 mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.2.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2 mirror://xorg/individual/proto/printproto-1.0.5.tar.bz2 mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.2.tar.bz2 -mirror://xorg/individual/util/imake-1.0.5.tar.bz2 +mirror://xorg/individual/util/imake-1.0.6.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 -mirror://xorg/individual/util/xorg-cf-files-1.0.4.tar.bz2 +mirror://xorg/individual/util/xorg-cf-files-1.0.5.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index eccc931f42f0..84ab81961227 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -1,5 +1,5 @@ mirror://xorg/X11R7.7/src/everything/applewmproto-1.4.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/bdftopcf-1.0.3.tar.bz2 +mirror://xorg/individual/app/bdftopcf-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2 @@ -46,25 +46,25 @@ 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 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2 -mirror://xorg/individual/proto/glproto-1.4.16.tar.bz2 -mirror://xorg/X11R7.7/src/everything/iceauth-1.0.5.tar.bz2 +mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2 +mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2 mirror://xorg/individual/proto/inputproto-2.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2 +mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2 mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.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.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXau-1.0.7.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXaw-1.0.11.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXcomposite-0.4.3.tar.bz2 +mirror://xorg/individual/lib/libX11-1.6.2.tar.bz2 +mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 +mirror://xorg/individual/lib/libXaw-1.0.12.tar.bz2 +mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2 +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.2.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 @@ -73,44 +73,44 @@ mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXmu-1.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXpm-3.5.10.tar.bz2 -mirror://xorg/individual/lib/libXrandr-1.4.1.tar.bz2 +mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 +mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2 +mirror://xorg/individual/lib/libXrandr-1.4.2.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2 mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.2.tar.bz2 -mirror://xorg/individual/lib/libXv-1.0.8.tar.bz2 +mirror://xorg/individual/lib/libXv-1.0.10.tar.bz2 mirror://xorg/individual/lib/libXvMC-1.0.8.tar.bz2 mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/makedepend-1.0.4.tar.bz2 +mirror://xorg/individual/util/makedepend-1.0.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2 -mirror://xorg/X11R7.7/src/everything/mkfontscale-1.1.0.tar.bz2 +mirror://xorg/individual/app/mkfontscale-1.1.1.tar.bz2 mirror://xorg/individual/proto/randrproto-1.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/sessreg-1.0.7.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/X11R7.7/src/everything/util-macros-1.17.tar.bz2 -mirror://xorg/X11R7.7/src/everything/videoproto-2.3.1.tar.bz2 +mirror://xorg/individual/util/util-macros-1.18.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 -mirror://xorg/X11R7.7/src/everything/xauth-1.0.7.tar.bz2 -mirror://xorg/individual/app/xbacklight-1.2.0.tar.bz2 +mirror://xorg/individual/app/xauth-1.0.8.tar.bz2 +mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xcursor-themes-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xdpyinfo-1.3.0.tar.bz2 +mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2 +mirror://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xev-1.2.0.tar.bz2 +mirror://xorg/individual/app/xev-1.2.1.tar.bz2 mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 @@ -119,12 +119,13 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.8.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-synaptics-1.7.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-synaptics-1.7.4.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.2.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.3.0.tar.bz2 +mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2 @@ -157,30 +158,30 @@ mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xhost-1.0.5.tar.bz2 +mirror://xorg/individual/app/xhost-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2 +mirror://xorg/individual/app/xinput-1.6.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2 +mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2 +mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.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.5.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/X11R7.7/src/everything/xprop-1.2.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xproto-7.0.23.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xrandr-1.3.5.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xrdb-1.0.9.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xrefresh-1.0.4.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xset-1.2.2.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/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 mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2 mirror://xorg/individual/lib/xtrans-1.3.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xvinfo-1.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xwd-1.0.5.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xwininfo-1.1.2.tar.bz2 +mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2 +mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 +mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xwud-1.0.4.tar.bz2 From eac9324034f2e86962cb8832d0944863b148b805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 14 Mar 2014 12:32:38 +0100 Subject: [PATCH 03/20] xorg: fixup after the update All that built before update builds now again (and glamor-egl is new). --- pkgs/servers/x11/xorg/overrides.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8b2617f06216..ead54a58a6bf 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -37,6 +37,10 @@ in ''; }; + glamoregl = attrs: attrs // { + installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; + }; + imake = attrs: attrs // { inherit (xorg) xorgcffiles; x11BuildHook = ./imake.sh; @@ -158,7 +162,7 @@ in xf86inputsynaptics = attrs: attrs // { buildInputs = attrs.buildInputs ++ [args.mtdev]; - installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/include/xorg"; + installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; }; xf86inputvmmouse = attrs: attrs // { @@ -169,6 +173,10 @@ in ]; }; + xf86videoati = attrs: attrs // { + NIX_CFLAGS_COMPILE = "-I${xorg.glamoregl}/include/xorg"; + }; + xf86videonv = attrs: attrs // { patches = [( args.fetchurl { url = http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/patch/?id=fc78fe98222b0204b8a2872a529763d6fe5048da; @@ -209,13 +217,6 @@ in ''; }; - xmodmap = attrs: attrs // { - patches = [(args.fetchurl { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-apps/xmodmap/files/xmodmap-1.0.7-_GNU_SOURCE.patch; - sha256 = "0q3zhy0wy1kkbpagzav8869fais4lw5q5vybgjj7wkmak06c5648"; - name = "new-gcc.patch"; - })]; - }; xorgserver = with xorg; attrs: attrs // { configureFlags = [ "--enable-xcsecurity" # enable SECURITY extension @@ -277,6 +278,6 @@ in }; xwd = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.libXt]; + buildInputs = with xorg; attrs.buildInputs ++ [libXt libxkbfile]; }; } From a245aeaef1a311c3a1b84d2259a55ee0b19b1480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 16 Mar 2014 18:46:20 +0100 Subject: [PATCH 04/20] nixos ati: support glamor, disabled by default This is from @ambrop72 #1969. --- nixos/modules/services/x11/xserver.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 2677f7584565..f422bc0cd2a5 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -20,6 +20,7 @@ let nvidiaLegacy304 = { modules = [ kernelPackages.nvidia_x11_legacy304 ]; driverName = "nvidia"; }; unichrome = { modules = [ pkgs.xorgVideoUnichrome ]; }; virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; }; + ati = { modules = [ pkgs.xorg.xf86videoati pkgs.xorg.glamoregl ]; }; }; driverNames = config.hardware.opengl.videoDrivers; @@ -372,6 +373,14 @@ in ''; }; + useGlamor = mkOption { + type = types.bool; + default = false; + description = '' + Whether to use the Glamor module for 2D acceleration, + if possible. + ''; + }; }; }; @@ -523,6 +532,13 @@ in '')} EndSection + ${if cfg.useGlamor then '' + Section "Module" + Load "dri2" + Load "glamoregl" + EndSection + '' else ""} + # For each supported driver, add a "Device" and "Screen" # section. ${flip concatMapStrings drivers (driver: '' @@ -530,6 +546,7 @@ in Section "Device" Identifier "Device-${driver.name}[0]" Driver "${driver.driverName}" + ${if cfg.useGlamor then ''Option "AccelMethod" "glamor"'' else ""} ${cfg.deviceSection} ${xrandrDeviceSection} EndSection From ad8adf12a40ababfce6a0aba38be3dfd1b60a152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 17 Mar 2014 22:04:03 +0100 Subject: [PATCH 05/20] mesa: major update to 10.0.4, seems to work finally --- pkgs/development/libraries/mesa/default.nix | 16 +- .../libraries/mesa/dricore-gallium.patch | 216 ------------------ pkgs/development/libraries/mesa/rtti.patch | 72 ++++++ .../libraries/mesa/static-gallium.patch | 9 +- .../libraries/mesa/werror-wundef.patch | 12 - pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 83 insertions(+), 244 deletions(-) delete mode 100644 pkgs/development/libraries/mesa/dricore-gallium.patch create mode 100644 pkgs/development/libraries/mesa/rtti.patch delete mode 100644 pkgs/development/libraries/mesa/werror-wundef.patch diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 68333892fd4c..1018a0e31f33 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -23,8 +23,8 @@ else */ let - version = "9.2.5"; - # this is the default search path for DRI drivers (note: X server no longer introduces an overriding env var) + version = "10.0.4"; + # this is the default search path for DRI drivers driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32"; in with { inherit (stdenv.lib) optional optionals optionalString; }; @@ -34,21 +34,23 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2"; - sha256 = "1w3bxclgwl2hwyxk3za7dbdakb8jsya7afck35cz0v8pxppvjsml"; + sha256 = "0h2sq8h0l7415vsqfkb7mn1rxm62m2anpi9swlca69fbpr9bavpz"; }; prePatch = "patchShebangs ."; patches = [ ./static-gallium.patch - ./dricore-gallium.patch - ./werror-wundef.patch + # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu), + # as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog ]; # Change the search path for EGL drivers from $drivers/* to driverLink postPatch = '' sed '/D_EGL_DRIVER_SEARCH_DIR=/s,EGL_DRIVER_INSTALL_DIR,${driverLink}/lib/egl,' \ -i src/egl/main/Makefile.am + '' + /* work around RTTI LLVM problems */ '' + patch -R -p1 < ${./rtti.patch} ''; outputs = ["out" "drivers" "osmesa"]; @@ -70,7 +72,7 @@ stdenv.mkDerivation { "--with-dri-drivers=i965,r200,radeon" "--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi" - "--with-egl-platforms=x11,wayland,drm" "--enable-gbm" "--enable-shared-glapi" + "--with-egl-platforms=x11,wayland,drm" "--enable-gbm" ] ++ optional enableTextureFloats "--enable-texture-float" ++ optionals enableExtraFeatures [ @@ -94,7 +96,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672, - # also, 10.* links bad due to some RTTI problem + #tests for 10.* fail to link due to some RTTI problem # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM; # also move libOSMesa to $osmesa, as it's relatively big diff --git a/pkgs/development/libraries/mesa/dricore-gallium.patch b/pkgs/development/libraries/mesa/dricore-gallium.patch deleted file mode 100644 index 9a8b6768277b..000000000000 --- a/pkgs/development/libraries/mesa/dricore-gallium.patch +++ /dev/null @@ -1,216 +0,0 @@ -commit 5208f187c7dade2c33385a56c1a5f1c3cedc8377 (HEAD, nix-patches) -Author: Vladimír Čunát -Date: Mon May 13 11:34:59 2013 +0200 - - 118-dricore-gallium.patch - -diff --git a/configure.ac b/configure.ac -index be89843..08f6761 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -928,6 +928,8 @@ AC_SUBST([GLESv2_LIB_DEPS]) - AC_SUBST([GLESv2_PC_LIB_PRIV]) - - DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la" -+MESAGALLIUM_LIBS="${DRI_LIB_DEPS}" -+AC_SUBST([MESAGALLIUM_LIBS], ${MESAGALLIUM_LIBS}) - - AC_SUBST([HAVE_XF86VIDMODE]) - -diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am -index 3cdec83..53ff69b 100644 ---- a/src/gallium/auxiliary/Makefile.am -+++ b/src/gallium/auxiliary/Makefile.am -@@ -34,14 +34,14 @@ if LLVM_NEEDS_FNORTTI - - AM_CXXFLAGS += -fno-rtti - --libgallium_la_LIBADD = $(LLVM_LIBS) -- - endif - - libgallium_la_SOURCES += \ - $(GALLIVM_SOURCES) \ - $(GALLIVM_CPP_SOURCES) - -+libgallium_la_LIBADD = ../../mesa/libdricore/libmesagallium.la $(LLVM_LIBS) $(GALLIUM_DRI_LIB_DEPS) -+ - endif - - indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py -diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am -index f4f9030..e9b9462 100644 ---- a/src/gallium/targets/dri-i915/Makefile.am -+++ b/src/gallium/targets/dri-i915/Makefile.am -@@ -49,7 +49,7 @@ i915_dri_la_SOURCES = \ - i915_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - i915_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ - $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ -diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am -index 69ccf32..fef4c63 100644 ---- a/src/gallium/targets/dri-nouveau/Makefile.am -+++ b/src/gallium/targets/dri-nouveau/Makefile.am -@@ -48,7 +48,7 @@ nouveau_dri_la_SOURCES = \ - nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - nouveau_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ - $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ -diff --git a/src/gallium/targets/dri-r300/Makefile.am b/src/gallium/targets/dri-r300/Makefile.am -index 8c0215d..6beb536 100644 ---- a/src/gallium/targets/dri-r300/Makefile.am -+++ b/src/gallium/targets/dri-r300/Makefile.am -@@ -49,7 +49,7 @@ r300_dri_la_SOURCES = \ - r300_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - r300_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ - $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ -diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/dri-r600/Makefile.am -index 2b3524b..d40fb89 100644 ---- a/src/gallium/targets/dri-r600/Makefile.am -+++ b/src/gallium/targets/dri-r600/Makefile.am -@@ -48,7 +48,7 @@ r600_dri_la_SOURCES = \ - r600_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - r600_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/drivers/r600/libr600.la \ - $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ -diff --git a/src/gallium/targets/dri-radeonsi/Makefile.am b/src/gallium/targets/dri-radeonsi/Makefile.am -index f7d87a6..87ab2aa 100644 ---- a/src/gallium/targets/dri-radeonsi/Makefile.am -+++ b/src/gallium/targets/dri-radeonsi/Makefile.am -@@ -49,7 +49,7 @@ radeonsi_dri_la_SOURCES = \ - radeonsi_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - radeonsi_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ - $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ -diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am -index 1104379..72d2401 100644 ---- a/src/gallium/targets/dri-swrast/Makefile.am -+++ b/src/gallium/targets/dri-swrast/Makefile.am -@@ -49,7 +49,7 @@ swrast_dri_la_SOURCES = \ - swrast_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - swrast_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \ - $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \ -diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am -index ca7df65..4384976 100644 ---- a/src/gallium/targets/dri-vmwgfx/Makefile.am -+++ b/src/gallium/targets/dri-vmwgfx/Makefile.am -@@ -48,7 +48,7 @@ vmwgfx_dri_la_SOURCES = \ - vmwgfx_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined - - vmwgfx_dri_la_LIBADD = \ -- $(top_builddir)/src/mesa/libmesagallium.la \ -+ @MESAGALLIUM_LIBS@ \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ - $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \ -diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am -index 5c40ae8..6922ab2 100644 ---- a/src/gallium/targets/egl-static/Makefile.am -+++ b/src/gallium/targets/egl-static/Makefile.am -@@ -104,7 +104,7 @@ AM_CPPFLAGS += \ - $(API_DEFINES) - - egl_gallium_la_LIBADD += \ -- $(top_builddir)/src/mesa/libmesagallium.la -+ @MESAGALLIUM_LIBS@ - # make st/mesa built-in when there is a single glapi provider - if HAVE_SHARED_GLAPI - egl_gallium_la_LIBADD += \ -diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am -index 41483dd..0045a673 100644 ---- a/src/mesa/Makefile.am -+++ b/src/mesa/Makefile.am -@@ -75,9 +75,6 @@ noinst_LTLIBRARIES += libmesa.la - else - check_LTLIBRARIES = libmesa.la - endif --if HAVE_GALLIUM --noinst_LTLIBRARIES += libmesagallium.la --endif - - SRCDIR = $(top_srcdir)/src/mesa/ - BUILDDIR = $(top_builddir)/src/mesa/ -@@ -119,15 +116,6 @@ libmesa_la_LIBADD = \ - $() - libmesa_la_LDFLAGS = - --libmesagallium_la_SOURCES = \ -- $(MESA_GALLIUM_FILES) \ -- $(MESA_ASM_FILES_FOR_ARCH) -- --libmesagallium_la_LIBADD = \ -- $(top_builddir)/src/glsl/libglsl.la \ -- $(top_builddir)/src/mesa/program/libprogram.la \ -- $() -- - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = gl.pc - -diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am -index 753548e..8761418 100644 ---- a/src/mesa/libdricore/Makefile.am -+++ b/src/mesa/libdricore/Makefile.am -@@ -42,6 +42,7 @@ libdricore@VERSION@_la_SOURCES = \ - libdricore@VERSION@_la_LDFLAGS = -version-number 1:0 - libdricore@VERSION@_la_LIBADD = \ - ../program/libdricore_program.la \ -+ $(top_builddir)/src/mapi/shared-glapi/libglapi.la - $() - - if HAVE_X86_ASM -@@ -65,8 +66,10 @@ AM_CPPFLAGS += \ - -I$(top_srcdir)/src/mesa/sparc - endif - -+lib_LTLIBRARIES = -+ - if HAVE_DRI --lib_LTLIBRARIES = libdricore@VERSION@.la -+lib_LTLIBRARIES += libdricore@VERSION@.la - - # Provide compatibility with scripts for the old Mesa build system for - # a while by putting a link to the driver into /lib of the build tree. -@@ -76,6 +79,17 @@ all-local: libdricore@VERSION@.la - ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so - endif - -+libmesagallium_la_SOURCES = \ -+ $(STATETRACKER_FILES) -+libmesagallium_la_CFLAGS = @LLVM_CFLAGS@ -+libmesagallium_la_CXXFLAGS = @LLVM_CXXFLAGS@ -+libmesagallium_la_LIBADD = libdricore@VERSION@.la $(LLVM_LIBS) -+ -+if HAVE_GALLIUM -+noinst_LTLIBRARIES = libmesagallium.la -+endif -+ -+ - CLEANFILES = \ - $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1 \ - $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so diff --git a/pkgs/development/libraries/mesa/rtti.patch b/pkgs/development/libraries/mesa/rtti.patch new file mode 100644 index 000000000000..6b123139013d --- /dev/null +++ b/pkgs/development/libraries/mesa/rtti.patch @@ -0,0 +1,72 @@ +http://lists.freedesktop.org/archives/mesa-dev/2013-October/046311.html + +* As discussed on the mailing list, + forced no-rtti breaks C++ public + API's such as the Haiku C++ libGL.so +* -fno-rtti *can* be still set however + instead of blindly forcing -fno-rtti, + we can rely on the llvm-config + --cppflags output. + If the system llvm is built without + rtti (default), the no-rtti flag will be + present in llvm-config --cppflags + (which we pick up on) + If llvm is built with rtti + (REQUIRES_RTTI=1), then -fno-rtti is + removed from llvm-config --cppflags. +* We could selectively add / remove rtti + from various components, however mixing + rtti and non-rtti code is tricky and + could introduce bugs. +* This needs impact tested. +--- + configure.ac | 1 - + scons/llvm.py | 3 --- + src/gallium/auxiliary/Makefile.am | 6 ------ + 3 files changed, 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0d082d2..3335575 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1943,7 +1943,6 @@ AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes) + AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes) + AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes) + AM_CONDITIONAL(HAVE_MESA_LLVM, test x$MESA_LLVM = x1) +-AM_CONDITIONAL(LLVM_NEEDS_FNORTTI, test $LLVM_VERSION_INT -ge 302) + + AC_SUBST([ELF_LIB]) + +diff --git a/scons/llvm.py b/scons/llvm.py +index 7cd609c..c1c3736 100644 +--- a/scons/llvm.py ++++ b/scons/llvm.py +@@ -195,9 +195,6 @@ def generate(env): + if llvm_version >= distutils.version.LooseVersion('3.1'): + components.append('mcjit') + +- if llvm_version >= distutils.version.LooseVersion('3.2'): +- env.Append(CXXFLAGS = ('-fno-rtti',)) +- + env.ParseConfig('llvm-config --libs ' + ' '.join(components)) + env.ParseConfig('llvm-config --ldflags') + except OSError: +diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am +index 670e124..2d2d8d4 100644 +--- a/src/gallium/auxiliary/Makefile.am ++++ b/src/gallium/auxiliary/Makefile.am +@@ -25,12 +25,6 @@ AM_CXXFLAGS += \ + $(GALLIUM_CFLAGS) \ + $(LLVM_CXXFLAGS) + +-if LLVM_NEEDS_FNORTTI +- +-AM_CXXFLAGS += -fno-rtti +- +-endif +- + libgallium_la_SOURCES += \ + $(GALLIVM_SOURCES) \ + $(GALLIVM_CPP_SOURCES) +-- +1.8.4 diff --git a/pkgs/development/libraries/mesa/static-gallium.patch b/pkgs/development/libraries/mesa/static-gallium.patch index 755682d9f1e8..bb3f60eaf88a 100644 --- a/pkgs/development/libraries/mesa/static-gallium.patch +++ b/pkgs/development/libraries/mesa/static-gallium.patch @@ -1,11 +1,4 @@ -commit 2c910b6f186616cac8134e2a2cbe239c8351ed99 -Author: Vladimír Čunát -Date: Mon May 13 11:34:34 2013 +0200 - - 117-static-gallium.patch - - Conflicts (moving of VISIBILITY_ confused the merge): - src/gallium/auxiliary/Makefile.am +117-static-gallium.patch from Ubuntu Trusty diff --git a/configure.ac b/configure.ac index b9fcb0b..be89843 100644 diff --git a/pkgs/development/libraries/mesa/werror-wundef.patch b/pkgs/development/libraries/mesa/werror-wundef.patch deleted file mode 100644 index 4663f68bd7d3..000000000000 --- a/pkgs/development/libraries/mesa/werror-wundef.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN Mesa-9.2.0-orig/include/GL/gl.h Mesa-9.2.0/include/GL/gl.h ---- Mesa-9.2.0-orig/include/GL/gl.h 2013-08-14 03:34:42.000000000 +0200 -+++ Mesa-9.2.0/include/GL/gl.h 2013-09-24 19:34:58.319140812 +0200 -@@ -2088,7 +2088,7 @@ typedef void (APIENTRYP PFNGLMULTITEXCOO - - - --#if GL_ARB_shader_objects -+#if defined(GL_ARB_shaders_objects) && GL_ARB_shader_objects - - #ifndef GL_MESA_shader_debug - #define GL_MESA_shader_debug 1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0ba9b3c29ed..10faa642844e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5252,7 +5252,7 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; - mesa_original = callPackage ../development/libraries/mesa { llvm = llvm_33; }; + mesa_original = callPackage ../development/libraries/mesa { }; mesa_noglu = if stdenv.isDarwin then darwinX11AndOpenGL // { driverLink = mesa_noglu; } else mesa_original; From aa48fc9b284fa1a2e042eccef862c6aafe30a293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Mar 2014 09:56:24 +0100 Subject: [PATCH 06/20] gtk2: bugfix update 2.24.22 -> .23 --- pkgs/development/libraries/gtk+/2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index fdc2c675847f..92c6debaa661 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.24.22"; + name = "gtk+-2.24.23"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz"; - sha256 = "0zxf810znlk80j230rbr0xscx3gm71jmf2bdiamg76rqzglvc55i"; + sha256 = "0z2ic7fma1lmmv4ncgki3vadqp7d0qkj2d235impsplvgvi0d950"; }; enableParallelBuilding = true; From 968c0e5dbd280c1111856710e126a009ce3335a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 19 Mar 2014 20:55:31 +0100 Subject: [PATCH 07/20] harfbuzz: minor update 0.9.26 -> .27 --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 227ac58bda57..f564c4bf1bd0 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.26"; + name = "harfbuzz-0.9.27"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "0mz220qv3xn3lk1v94q1wgykayxnas94n8ks1liwkdazs71pvvax"; + sha256 = "1ns7njbm45fjbc9p7gcpjc606ax120ab0i9cbx6v3mcq3kllln08"; }; configureFlags = [ From 150102ce30e6c58f66bc0bd555e4e4bbdfd27d81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 19 Mar 2014 21:45:13 +0100 Subject: [PATCH 08/20] xorg.libFS: maintenance update 1.0.5 -> .6 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 277914294187..2a04ab54b325 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -560,11 +560,11 @@ let })) // {inherit applewmproto libX11 libXext xextproto ;}; libFS = (stdenv.mkDerivation ((if overrides ? libFS then overrides.libFS else x: x) { - name = "libFS-1.0.5"; + name = "libFS-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2; - sha256 = "01v1z6hy702pcxz89kqb84w9gjjrvnjqsxc2zzvswlw0vl2k1sr2"; + url = mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2; + sha256 = "1mxfsvj9m3pn8cdkcn4kg190zp665mf4pv0083g6xykvsgxzq1wh"; }; buildInputs = [pkgconfig fontsproto xproto xtrans ]; })) // {inherit fontsproto xproto xtrans ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 84ab81961227..4d035bdf7756 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -54,7 +54,7 @@ mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2 mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2 -mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2 +mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 From 65155c20d585eb1d3b2084cac23303d9ad61b0b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 19 Mar 2014 22:02:18 +0100 Subject: [PATCH 09/20] automake: update from 1.12.4 to 1.12.6 --- pkgs/development/tools/misc/automake/automake-1.12.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix index 8bee4790bcb7..269d423f2fab 100644 --- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, perl, autoconf, makeWrapper, doCheck ? false }: stdenv.mkDerivation rec { - name = "automake-1.12.4"; + name = "automake-1.12.6"; # TODO: Remove the `aclocal' wrapper when $ACLOCAL_PATH support is # available upstream; see @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "0wppdm0wfizs6nmiwlkigcmh2pn33dywdkl7b407j3pvwn622vsi"; + sha256 = "1ynvca8z4aqcwr94rf7j1bfiid2w9w250y9qhnyj9vmi8lhsnd7q"; }; buildInputs = [perl autoconf makeWrapper]; From 02b85f51913be7d95dba25b90eace31b862edcae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 23 Mar 2014 12:25:20 +0100 Subject: [PATCH 10/20] libjpeg(_turbo): minor update 1.3.0 -> .1 The security patch got incorporated into the release. --- .../libraries/libjpeg-turbo/default.nix | 6 +-- ...g-turbo-1.3.0-CVE-2013-6629-and-6630.patch | 40 ------------------- 2 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 8976e7431928..bf27e074dd58 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, nasm }: stdenv.mkDerivation rec { - name = "libjpeg-turbo-1.3.0"; + name = "libjpeg-turbo-1.3.1"; src = fetchurl { url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; - sha256 = "0d0jwdmj3h89bxdxlwrys2mw18mqcj4rzgb5l2ndpah8zj600mr6"; + sha256 = "1fbgcvlnn3d5gvf0v9jnlcabpv2z3nwxclzyabahxi6x2xs90cn1"; }; - patches = [ ./libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch ]; - buildInputs = [ nasm ]; doCheck = true; diff --git a/pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch b/pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch deleted file mode 100644 index 8c0f9c75054a..000000000000 --- a/pkgs/development/libraries/libjpeg-turbo/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch +++ /dev/null @@ -1,40 +0,0 @@ -Thanks to the sources below; this patch discovered via Gentoo. - -http://bugzilla.redhat.com/show_bug.cgi?id=1031734 -http://bugzilla.redhat.com/show_bug.cgi?id=1031749 -http://sourceforge.net/p/libjpeg-turbo/code/1090/ - ---- libjpeg-turbo-1.3.0/jdmarker.c -+++ libjpeg-turbo-1.3.0/jdmarker.c -@@ -304,7 +304,7 @@ - /* Process a SOS marker */ - { - INT32 length; -- int i, ci, n, c, cc; -+ int i, ci, n, c, cc, pi; - jpeg_component_info * compptr; - INPUT_VARS(cinfo); - -@@ -348,6 +348,13 @@ - - TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc, - compptr->dc_tbl_no, compptr->ac_tbl_no); -+ -+ /* This CSi (cc) should differ from the previous CSi */ -+ for (pi = 0; pi < i; pi++) { -+ if (cinfo->cur_comp_info[pi] == compptr) { -+ ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc); -+ } -+ } - } - - /* Collect the additional scan parameters Ss, Se, Ah/Al. */ -@@ -465,6 +472,8 @@ - for (i = 0; i < count; i++) - INPUT_BYTE(cinfo, huffval[i], return FALSE); - -+ MEMZERO(&huffval[count], (256 - count) * SIZEOF(UINT8)); -+ - length -= count; - - if (index & 0x10) { /* AC table definition */ From 97f1a251ed5f5446c227d0ece8c0410222ab87ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 23 Mar 2014 20:32:47 +0100 Subject: [PATCH 11/20] mesa: add symlinks from $out/lib/*.so to $drivers/lib This is mainly in order for libGL to be present in /run/opengl-drivers{,-32}. Now even with mesa drivers pkgs will use your current nixos libGL instead of the one it was built against. Thanks to @iElectric for suggesting this change. --- pkgs/development/libraries/mesa/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1018a0e31f33..e5cd54c572f9 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -152,6 +152,11 @@ stdenv.mkDerivation { substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" '' + /* move vdpau drivers to $drivers/lib, so they are found */ '' mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau + '' + /* add libGL* links from /run/opengl-driver */ '' + ( + cd "$drivers/lib" + cp -s "$out"/lib/*.so . + ) ''; #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM From 11492176d598b1d6ab0166cadbe96c7534497e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 23 Mar 2014 21:28:14 +0100 Subject: [PATCH 12/20] xorg: add "intel-testing" video driver, currently 2.99.911 --- nixos/modules/services/x11/xserver.nix | 1 + pkgs/servers/x11/xorg/xf86-video-intel-testing.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 17 insertions(+) create mode 100644 pkgs/servers/x11/xorg/xf86-video-intel-testing.nix diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index f422bc0cd2a5..25ba3606adc5 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -21,6 +21,7 @@ let unichrome = { modules = [ pkgs.xorgVideoUnichrome ]; }; virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; }; ati = { modules = [ pkgs.xorg.xf86videoati pkgs.xorg.glamoregl ]; }; + intel-testing = { modules = with pkgs.xorg; [ xf86videointel-testing glamoregl ]; driverName = "intel"; }; }; driverNames = config.hardware.opengl.videoDrivers; diff --git a/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix b/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix new file mode 100644 index 000000000000..5877643fb1b1 --- /dev/null +++ b/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, pkgconfig, libdrm, udev, xorg }: + +with xorg; + +(stdenv.mkDerivation ({ + name = "xf86-video-intel-2.99.911"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-intel-2.99.911.tar.bz2; + sha256 = "1mkhfa10304xvs763dz1kj93zkmdidlfxhsy5j8ljkfc3d4nhyjf"; + }; + buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ]; +})) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ;} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c345848b2a05..4d9b83379a5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6515,6 +6515,8 @@ let dbus libuuid openssl gperf m4 autoconf automake libtool xmlto asciidoc udev flex bison python mtdev pixman; mesa = mesa_noglu; + } // { + xf86videointel-testing = callPackage ../servers/x11/xorg/xf86-video-intel-testing.nix { }; }); xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { }; From 11e8c4ae8cab3794cc9dc463b75844c1278f6367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 23 Mar 2014 22:26:08 +0100 Subject: [PATCH 13/20] superTuxKart: fix build with newer mesa The idea is taken from Arch. --- pkgs/games/super-tux-kart/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 46f22d332ccb..cd2698665f62 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { preConfigure = '' echo Building internal Irrlicht cd lib/irrlicht/source/Irrlicht/ + cp "${mesa}"/include/GL/{gl,glx,wgl}ext.h . NDEBUG=1 make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} cd - ''; From 1dc040a8ad7e99f2bfbe180412d15d140d6bea58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 24 Mar 2014 22:39:42 +0100 Subject: [PATCH 14/20] gdk_pixbuf: minor update --- pkgs/development/libraries/gdk-pixbuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index cd3e76316186..39be4720eb14 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -3,14 +3,14 @@ let ver_maj = "2.30"; - ver_min = "4"; + ver_min = "6"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "0ldhpdalbyi6q5k1dz498i9hqcsd51yxq0f91ck9p0h4v38blfx1"; + sha256 = "0nkz19xlh60bf9bqylh98n8rynpjyx1nzp1gcr6zljgvmnj4yfa3"; }; setupHook = ./setup-hook.sh; From 151ac5ab9e4fd445b23fcfb6be7681129d544f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 27 Mar 2014 20:53:50 +0100 Subject: [PATCH 15/20] gtk+3 core stack: update to 3.12 --- pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix | 6 +++--- pkgs/desktops/gnome-3/core/at-spi2-core/default.nix | 6 +++--- pkgs/development/libraries/atk/default.nix | 4 ++-- pkgs/development/libraries/glib/default.nix | 6 +++--- .../libraries/gobject-introspection/default.nix | 4 ++-- pkgs/development/libraries/gtk+/3.x.nix | 13 ++++++++----- 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix index 742036f16b3f..fc0c4f2a6bc0 100644 --- a/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix +++ b/pkgs/desktops/gnome-3/core/at-spi2-atk/default.nix @@ -2,14 +2,14 @@ , intltool, dbus_glib, at_spi2_core, libSM }: stdenv.mkDerivation rec { - versionMajor = "2.10"; - versionMinor = "2"; + versionMajor = "2.12"; + versionMinor = "0"; moduleName = "at-spi2-atk"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1xfh89lydl8d18dhnzwvzcsyyybr5q3ik001qgq520l3qh8shj73"; + sha256 = "0crn3k6qvn6fjvgm68dj5ska1ppfgmdkaia2db1jp0b9y74nfm1v"; }; buildInputs = [ python pkgconfig popt atk libX11 libICE xlibs.libXtst libXi diff --git a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix index ab30c81efc23..d60a0ff7480c 100644 --- a/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix +++ b/pkgs/desktops/gnome-3/core/at-spi2-core/default.nix @@ -2,14 +2,14 @@ , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: stdenv.mkDerivation (rec { - versionMajor = "2.10"; - versionMinor = "2"; + versionMajor = "2.12"; + versionMinor = "0"; moduleName = "at-spi2-core"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "1qfxlbmbaihgmqgkxnywnji9wkbvn8pvbv20x5glv3jc9zw5innk"; + sha256 = "12gvsgdaxnxskndlhlmdkc50cfqgmzfc4n8la9944fz5k3fhwmfv"; }; buildInputs = [ diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index a93aaa5a43fc..2dca2a8e1ec5 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }: let - ver_maj = "2.10"; + ver_maj = "2.12"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz"; - sha256 = "1c2hbg66wfvibsz2ia0ri48yr62751fn950i97c53j3b0fjifsb3"; + sha256 = "13zijfcmx7sda83qkryzsmr9hw0r3b73xkagq9cmm733fhcl7a28"; }; buildInputs = libintlOrEmpty; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 6fa77b233c67..af4b152dccee 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -35,8 +35,8 @@ let ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true ''; - ver_maj = "2.38"; - ver_min = "2"; + ver_maj = "2.40"; + ver_min = "0"; in with { inherit (stdenv.lib) optional optionals optionalString; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "0d2px8m77603s5pm3md4bcm5d0ksbcsb6ik1w52hjslnq1a9hsh5"; + sha256 = "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd"; }; buildInputs = [ libelf ] diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index da746969ed78..7686fb308383 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -5,7 +5,7 @@ # In that case its about 6MB which could be separated let - ver_maj = "1.38"; + ver_maj = "1.40"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz"; - sha256 = "0wvxyvgajmms2bb6k3pf1rdpnd79xdxamykzvxzmcyn1ag9yax9m"; + sha256 = "162flbzwzz0b8axab2gimc4dglpaw88fh1d177zfg0whczlpbsln"; }; buildInputs = [ flex bison glib pkgconfig python ] diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 9f89fc074f18..c8e4299e1a76 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -9,8 +9,8 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; let - ver_maj = "3.10"; - ver_min = "7"; + ver_maj = "3.12"; + ver_min = "0"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -18,11 +18,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "09wlsim4immrws0fyvpk03sspsljcsgybrwp73scycah70axxsdp"; + sha256 = "0jvf9dawq82x1xsr2f56fw3y7yfwapgdj16gr4d5m6q2shf78sgb"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; buildInputs = [ libxkbcommon ]; @@ -33,6 +31,11 @@ stdenv.mkDerivation rec { ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; + # demos fail to install, no idea where's the problem + preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in"; + + enableParallelBuilding = true; + postInstall = "rm -rf $out/share/gtk-doc"; meta = { From 9ddc57cbea569f75e81ef41d6ce3c86128a81bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 27 Mar 2014 22:14:51 +0100 Subject: [PATCH 16/20] xorg.xf86-video-vmware: minor update Patch no longer needed to build. --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/overrides.nix | 4 ---- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 2a04ab54b325..5ce58e67c401 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1750,11 +1750,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;}; xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) { - name = "xf86-video-vmware-13.0.1"; + name = "xf86-video-vmware-13.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.0.1.tar.bz2; - sha256 = "0ggyz3yl1ly0p9c9lva5z3892vm033z49py3svd2wh92bi0xlbc0"; + url = mirror://xorg/individual/driver/xf86-video-vmware-13.0.2.tar.bz2; + sha256 = "0m1wfsv34s4pyr5ry87yyjb2p6vmy6vyypdz5jx0sqnkx8n3vfn8"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ]; })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 043bdc99cb78..3f591cb7c0e3 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -186,10 +186,6 @@ in xf86videovmware = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker - patches = [( args.fetchurl { - url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xatracker-v2-fixes.patch?h=packages/xf86-video-vmware; - sha256 = "1k5a3zf2bzmw84di31b8zfy51n2mqrr01xjfy5nw7395qv5r5cvs"; - })]; }; xdriinfo = attrs: attrs // { diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4d035bdf7756..89ea4b956306 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -153,7 +153,7 @@ mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-13.0.1.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-13.0.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86vidmodeproto-2.3.1.tar.bz2 From 835f9e5f19c93606778822e731cf9064018ea9b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 27 Mar 2014 22:47:29 +0100 Subject: [PATCH 17/20] libgsf: maintenance update to fix build with new glib --- pkgs/development/libraries/libgsf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 0c79b20b5645..dbcdabc89510 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -4,11 +4,11 @@ with { inherit (stdenv.lib) optionals; }; stdenv.mkDerivation rec { - name = "libgsf-1.14.28"; + name = "libgsf-1.14.30"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "1r6bkwramb6qglmgbjmqvr5sahbfmql057ql97mx99fs3x7r357a"; + sha256 = "0w2v1a9sxsymd1mcy4mwsz4r6za9iwq69rj86nb939p41d4c6j6b"; }; nativeBuildInputs = [ pkgconfig intltool ]; From bd1abb36dd2a357cc9e12102e42fbedc071ba503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 29 Mar 2014 16:15:13 +0100 Subject: [PATCH 18/20] xorg: minor updates of xrandr and util-macros --- pkgs/servers/x11/xorg/default.nix | 12 ++++++------ pkgs/servers/x11/xorg/extra.list | 1 - pkgs/servers/x11/xorg/tarballs-7.7.list | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) 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 From 71982ab7083dfd39a344adbb83eedb4d12acbad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 29 Mar 2014 16:45:37 +0100 Subject: [PATCH 19/20] gtkmm3: update to fix build with gtk-3.12 --- pkgs/development/libraries/gtkmm/3.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 8649abec6378..600ea1a0278f 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: let - ver_maj = "3.10"; - ver_min = "1"; + ver_maj = "3.11"; # unstable version, but ATM no stable builds with gtk-3.12 and this is the version used in GNOME-3.12 "stable" + ver_min = "9"; in stdenv.mkDerivation rec { name = "gtkmm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "0f1587pc6x8hn268vqj5zr4dvyisj5zd9zpsfxyfm1pkbjmcv9bg"; + sha256 = "04yji82prijlwpd3blx0am1ikjy7y7ih7jd628dywdjbbfq42920"; }; nativeBuildInputs = [ pkgconfig ]; From 44f48620415c8f395394aaad2e3b702185dd78a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 1 Apr 2014 10:53:34 +0200 Subject: [PATCH 20/20] xorg.xtrans: maintenance update --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c1e274081ea2..0ec14c8d62cd 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2060,11 +2060,11 @@ let })) // {inherit libX11 xbitmaps libXcursor libXmu ;}; xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) { - name = "xtrans-1.3.3"; + name = "xtrans-1.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/xtrans-1.3.3.tar.bz2; - sha256 = "1gq9i9p1q7wgaj1vm1n5mrw0rp0bpcdk4hdy9yj82i92rsnv8bb2"; + url = mirror://xorg/individual/lib/xtrans-1.3.4.tar.bz2; + sha256 = "0fjq9xa37k1czkidj3c5sads51gibrjvrxz9ag3hh9fmxzilwk85"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 9de73701e82e..a3faf2569264 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -180,7 +180,7 @@ 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 mirror://xorg/X11R7.7/src/everything/xsetroot-1.1.0.tar.bz2 -mirror://xorg/individual/lib/xtrans-1.3.3.tar.bz2 +mirror://xorg/individual/lib/xtrans-1.3.4.tar.bz2 mirror://xorg/individual/app/xvinfo-1.1.2.tar.bz2 mirror://xorg/individual/app/xwd-1.0.6.tar.bz2 mirror://xorg/individual/app/xwininfo-1.1.3.tar.bz2