diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 164a6e56080..1afdb57c127 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -510,11 +510,11 @@ let })) // {inherit xproto ;}; inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) { - name = "inputproto-2.2"; + name = "inputproto-2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/inputproto-2.2.tar.bz2; - sha256 = "1c5wqamfsd8g5i8kya5pjfmcac8q5zq1l3vclh6p96f24nmicxfy"; + url = mirror://xorg/individual/proto/inputproto-2.3.tar.bz2; + sha256 = "0by3aa8i1gki6i904i34vlrymv5p8il05gr83sf8x7v9ys9v29kx"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -540,11 +540,11 @@ let })) // {inherit applewmproto libX11 libXext xextproto ;}; libFS = (stdenv.mkDerivation ((if overrides ? libFS then overrides.libFS else x: x) { - name = "libFS-1.0.4"; + name = "libFS-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libFS-1.0.4.tar.bz2; - sha256 = "05c3bqgn5m7j4kx8wvy0p36faq6f9jv5yq12m6033m4lflg7cwvh"; + url = mirror://xorg/individual/lib/libFS-1.0.5.tar.bz2; + sha256 = "01v1z6hy702pcxz89kqb84w9gjjrvnjqsxc2zzvswlw0vl2k1sr2"; }; buildInputs = [pkgconfig fontsproto xproto xtrans ]; })) // {inherit fontsproto xproto xtrans ;}; @@ -580,11 +580,11 @@ let })) // {inherit windowswmproto libX11 libXext xextproto ;}; libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) { - name = "libX11-1.5.0"; + name = "libX11-1.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2; - sha256 = "11jdpl15bxwpwv0knpkh990s8jvlybng3dx477pkrz1bx7byz0n3"; + url = mirror://xorg/individual/lib/libX11-1.6.0.tar.bz2; + sha256 = "1yhrf36is2f2h28x8wjd87wmdhslmzg06jg1gwq55hiy6h9184sk"; }; buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;}; @@ -630,11 +630,11 @@ let })) // {inherit compositeproto libX11 libXfixes xproto ;}; libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) { - name = "libXcursor-1.1.13"; + name = "libXcursor-1.1.14"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXcursor-1.1.13.tar.bz2; - sha256 = "13xd1dyb06gwdwb0bxb22fkgdlmis6wrljm2xk6fhz0v9bg2g27p"; + url = mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2; + sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv"; }; buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ]; })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; @@ -660,21 +660,21 @@ let })) // {inherit xproto ;}; libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) { - name = "libXext-1.3.1"; + name = "libXext-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXext-1.3.1.tar.bz2; - sha256 = "0ng8clhn7srbkadxjc7ih3z3v27v9ny0aa0dqkgddgxpgrhrq8jn"; + url = mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2; + sha256 = "1q1j0kjyhmy24wqr6mdkrrciffyqhmc8vn95za2w1ka6qrdhfagq"; }; buildInputs = [pkgconfig libX11 xextproto xproto ]; })) // {inherit libX11 xextproto xproto ;}; libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) { - name = "libXfixes-5.0"; + name = "libXfixes-5.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXfixes-5.0.tar.bz2; - sha256 = "1qx2rmwhmca2n7rgafy0arp15k5vwhdhhh6v6mx76hlj29328yjk"; + url = mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2; + sha256 = "0rs7qgzr6dpr62db7sd91c1b47hzhzfr010qwnpcm8sg122w1gk3"; }; buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ]; })) // {inherit fixesproto libX11 xextproto xproto ;}; @@ -700,21 +700,21 @@ let })) // {inherit fontconfig freetype libX11 xproto libXrender ;}; libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) { - name = "libXi-1.6.1"; + name = "libXi-1.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXi-1.6.1.tar.bz2; - sha256 = "029ihw4jq8mng8rx7a3jdvq64jm1zdkqidca93zmxv4jf9yn5qzj"; + url = mirror://xorg/individual/lib/libXi-1.7.1.tar.bz2; + sha256 = "1ib6026bh4bcc2q0y04klqsvjl9pwabxnr8ybkh52g65d5mxnap9"; }; - buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ]; - })) // {inherit inputproto libX11 libXext xextproto xproto ;}; + buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; + })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;}; libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) { - name = "libXinerama-1.1.2"; + name = "libXinerama-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXinerama-1.1.2.tar.bz2; - sha256 = "1b3aq1762hxzchd9ndavdjlksq93991s0g2z6spf8wl3v0pprrx4"; + url = mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2; + sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs"; }; buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ]; })) // {inherit libX11 libXext xextproto xineramaproto ;}; @@ -730,11 +730,11 @@ let })) // {inherit libX11 libXext xextproto xproto libXt ;}; libXp = (stdenv.mkDerivation ((if overrides ? libXp then overrides.libXp else x: x) { - name = "libXp-1.0.1"; + name = "libXp-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXp-1.0.1.tar.bz2; - sha256 = "1lj3cjg9ygbmclxvayy5v88kkndpy9jq6y68p13dc5jn01hg5lbi"; + url = mirror://xorg/individual/lib/libXp-1.0.2.tar.bz2; + sha256 = "1dfh5w8sjz5b5fl6dl4y63ckq99snslz7bir8zq2rg8ax6syabwm"; }; buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ]; })) // {inherit printproto libX11 libXau libXext xextproto ;}; @@ -750,11 +750,11 @@ let })) // {inherit libX11 libXext xextproto xproto libXt ;}; libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) { - name = "libXrandr-1.4.0"; + name = "libXrandr-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrandr-1.4.0.tar.bz2; - sha256 = "1hzm2ndra4nf8xxzm4lzd225zj05hzbzcq464q2znah15ynd0fh3"; + url = mirror://xorg/individual/lib/libXrandr-1.4.1.tar.bz2; + sha256 = "01dr1wvyxq2y4yq4hilgglkjlvn551dmnl4l65nfm8nh1x4s056r"; }; buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; @@ -763,28 +763,28 @@ let name = "libXrender-0.9.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXrender-0.9.7.tar.bz2; + url = mirror://xorg/individual/lib/libXrender-0.9.7.tar.bz2; sha256 = "1rmvja2gkf5v0k2n1bcghw8v98m2kfn3af0rbmsda5dwr69npd7r"; }; buildInputs = [pkgconfig renderproto libX11 xproto ]; })) // {inherit renderproto libX11 xproto ;}; libXres = (stdenv.mkDerivation ((if overrides ? libXres then overrides.libXres else x: x) { - name = "libXres-1.0.6"; + name = "libXres-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXres-1.0.6.tar.bz2; - sha256 = "1478pm70gdi6l70r4jpkyyg2am9wv6xh53z9ibwq5cg84p4n31pz"; + url = mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2; + sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296"; }; buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ]; })) // {inherit resourceproto libX11 libXext xextproto xproto ;}; libXt = (stdenv.mkDerivation ((if overrides ? libXt then overrides.libXt else x: x) { - name = "libXt-1.1.3"; + name = "libXt-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXt-1.1.3.tar.bz2; - sha256 = "1g85gwnhs7lg5f01gfi1cpb916xc3spm1fjlv2f4xz2zzk1r7dcd"; + url = mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2; + sha256 = "0myxwbx9ylam5x3ia5b5f4x8azcqdm420h9ad1r4hrgmi2lrffl4"; }; buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ]; })) // {inherit libICE kbproto libSM libX11 xproto ;}; @@ -800,11 +800,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.7"; + name = "libXv-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXv-1.0.7.tar.bz2; - sha256 = "044hllz013afhzywwpxz007l4zjy99bv9im065rqd30zckmllrjx"; + url = mirror://xorg/individual/lib/libXv-1.0.8.tar.bz2; + sha256 = "1mvkmypf9rsr3lr161hf9sjadlirb116jfp5lk70j29r8x9yn02g"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ]; })) // {inherit videoproto libX11 libXext xextproto xproto ;}; @@ -813,18 +813,18 @@ let name = "libXvMC-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXvMC-1.0.7.tar.bz2; + url = mirror://xorg/individual/lib/libXvMC-1.0.7.tar.bz2; sha256 = "18yf6ysc01pqkbk9704914ghalq1sl2hfdjmwggxm8qqhpy8bw18"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ]; })) // {inherit videoproto libX11 libXext xextproto xproto libXv ;}; libXxf86dga = (stdenv.mkDerivation ((if overrides ? libXxf86dga then overrides.libXxf86dga else x: x) { - name = "libXxf86dga-1.1.3"; + name = "libXxf86dga-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXxf86dga-1.1.3.tar.bz2; - sha256 = "15291ddhyr54sribwbg8hxx2psgzm5gh0pgkw5yrf3zgvdsa67sm"; + url = mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2; + sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ]; })) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;}; @@ -840,21 +840,21 @@ let })) // {inherit libX11 libXext xextproto xf86miscproto xproto ;}; libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) { - name = "libXxf86vm-1.1.2"; + name = "libXxf86vm-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libXxf86vm-1.1.2.tar.bz2; - sha256 = "117w92xz39rcqcahspi48nc04cc9110x1dycpf3vbcb6p0pifr55"; + url = mirror://xorg/individual/lib/libXxf86vm-1.1.3.tar.bz2; + sha256 = "1f1pxj018nk7ybxv58jmn5y8gm2288p4q3l2dng9n1p25v1qcpns"; }; buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ]; })) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;}; libdmx = (stdenv.mkDerivation ((if overrides ? libdmx then overrides.libdmx else x: x) { - name = "libdmx-1.1.2"; + name = "libdmx-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/libdmx-1.1.2.tar.bz2; - sha256 = "1fiq73sfxcbyjval118ialwrzxhzb08xsxmg69adcs47i9j0p1x7"; + url = mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2; + sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9"; }; buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ]; })) // {inherit dmxproto libX11 libXext xextproto ;}; @@ -890,11 +890,11 @@ let })) // {inherit ;}; libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) { - name = "libxcb-1.9"; + name = "libxcb-1.9.1"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2; - sha256 = "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8"; + url = http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2; + sha256 = "0brn7vw66widc5mw7gynwy8dln3gmzym2fqqyzk6k58bxgs5yjnl"; }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; @@ -1516,8 +1516,8 @@ let url = mirror://xorg/individual/driver/xf86-video-intel-2.21.8.tar.bz2; sha256 = "13yg9bcz55plnpx7k5xkbgpaj6hnlszxys94lxqa6b012l2hr1ad"; }; - buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ]; - })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrender libXvMC ;}; + 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 ;}; xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { name = "xf86-video-mach64-6.9.4"; @@ -1570,11 +1570,11 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) { - name = "xf86-video-openchrome-0.3.2"; + name = "xf86-video-openchrome-0.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-openchrome-0.3.2.tar.bz2; - sha256 = "11pm8h9qxdjxn5rwz433cbnp6v0gg62b61nl20gxvghb7rgwv70m"; + url = mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2; + sha256 = "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4"; }; buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; })) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index c1ef747b3a8..2372df2701e 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,8 +1,9 @@ http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.9.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2 http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2 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.3.9.tar.bz2 +http://xorg.freedesktop.org/releases/individual/util/util-macros-1.17.tar.bz2 diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 7b00e5e9043..256d108c4e8 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -2,9 +2,9 @@ # Typical command to generate the list of tarballs: -# export i="mirror://xorg/X11R7.6/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.6.list +# export i="mirror://xorg/X11R7.7/src/everything/"; cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) | perl -e 'while (<>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' | sort > tarballs-7.7.list # manually update extra.list -# then run: cat tarballs-7.6.list extra.list old.list | perl ./generate-expr-from-tarballs.pl +# then run: cat tarballs-7.7.list extra.list old.list | perl ./generate-expr-from-tarballs.pl # tarballs-x.y.list is generated + changes for individual packages # extra.list are packages not contained in the tarballs # old.list are packages that used to be part of the tarballs diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index 742c656b9b7..68c88594932 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -5,7 +5,7 @@ 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/xmessage-1.0.4.tar.bz2 -mirror://xorg/individual/lib/libXp-1.0.1.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 diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8d2de052586..cbf24c0a51a 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -5,6 +5,18 @@ let configureFlags="$configureFlags --enable-malloc0returnsnull"; fi ''; + + gitRelease = { libName, version, rev, sha256 } : attrs : attrs // { + name = libName + "-" + version; + src = args.fetchgit { + url = git://anongit.freedesktop.org/xorg/lib/ + libName; + inherit rev sha256; + }; + buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ]; + preConfigure = (attrs.preConfigure or "") + "\n./autogen.sh"; + }; + + compose = f: g: x: f (g x); in { encodings = attrs: attrs // { @@ -35,17 +47,10 @@ in }; libxcb = attrs : attrs // { - # I only remove python from the original, and add xproto. I don't know how - # to achieve that referring to attrs.buildInputs. - # I should use: builtins.unsafeDiscardStringContext - buildInputs = [args.pkgconfig args.libxslt xorg.libpthreadstubs /*xorg.python*/ - xorg.libXau xorg.xcbproto xorg.libXdmcp ] ++ [ xorg.xproto ]; nativeBuildInputs = [ args.python ]; }; xcbproto = attrs : attrs // { - # I only remove python from the original. - buildInputs = [args.pkgconfig /*xorg.python*/ ]; nativeBuildInputs = [ args.python ]; }; @@ -62,16 +67,13 @@ in ''; }; - libXrender = attrs: attrs // { - preConfigure = setMalloc0ReturnsNullCrossCompiling; - }; - libXxf86vm = attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling; }; libXrandr = attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling; + propagatedBuildInputs = [xorg.libXrender]; }; # Propagate some build inputs because of header file dependencies. @@ -95,18 +97,39 @@ in }; libXft = attrs: attrs // { - buildInputs = attrs.buildInputs ++ - [ xorg.xproto xorg.libX11 xorg.renderproto ]; propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; libXext = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.libXau]; - propagatedBuildInputs = [ xorg.xproto ]; + propagatedBuildInputs = [ xorg.xproto xorg.libXau ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; + libSM = attrs: attrs + // { propagatedBuildInputs = [ xorg.libICE ]; }; + + libXi = gitRelease { + libName = "libXi"; + version = "1.7.1.91"; + rev = "661c45ca17c434dbd342a46fd3fb813852ae0ca9"; + sha256 = "01wx8fgjjfqm0sm9anj6rmz72yvjyb4y3ifjk2q4ixd7pdp63bx6"; + }; + + libXrender = compose (gitRelease { + libName = "libXrender"; + version = "0.9.7.91"; + rev = "786f78fd8df6d165ccbc81f306fd9f22b5c1551c"; + sha256 = "157ljyhkxqk2xgizrq8pmpl75szb5j89gvvhkxsi0lys1wnbrxi4"; + }) (attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling; }); + + libXvMC = compose (gitRelease { + libName = "libXvMC"; + version = "1.0.7.91"; + rev = "8c164524d229adb6141fdac8336b3823e7fe1a5d"; + sha256 = "157ljyhkxqk2xgizrq8pmpl75szb5j89gvvhkxsi0lys1wnbrxi4"; + }) (attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.renderproto]; }); + libXpm = attrs: attrs // { patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; }; @@ -119,13 +142,12 @@ in ''; }; - x11perf = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${args.freetype}/include/freetype2"; - buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ]; + utilmacros = attrs: attrs // { # not needed for releases, we propagate the needed tools + propagatedBuildInputs = with args; [ automake autoconf libtool ]; }; - xev = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ xorg.libXrender ]; + x11perf = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ]; }; xf86inputevdev = attrs: attrs // { @@ -196,8 +218,6 @@ in ''; }; - libSM = attrs: attrs - // { propagatedBuildInputs = [ xorg.libICE ]; }; lndir = attrs: attrs // { preConfigure = '' @@ -210,17 +230,13 @@ in nativeBuildInputs = [args.bison args.flex]; }; - xbacklight = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.libXrender]; - }; - xcursorthemes = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.xcursorgen]; configureFlags = "--with-cursordir=$(out)/share/icons"; }; xinput = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [xorg.libXrender]; + propagatedBuildInputs = [xorg.libXfixes]; }; xinit = attrs: attrs // { @@ -231,6 +247,10 @@ in ''; }; + xf86videointel = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [xorg.libXfixes]; + }; + xwd = attrs: attrs // { buildInputs = attrs.buildInputs ++ [xorg.libXt]; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index f2ad7a4bcc5..cbdd379d606 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -46,42 +46,42 @@ 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/X11R7.7/src/everything/inputproto-2.2.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/X11R7.7/src/everything/libdmx-1.1.2.tar.bz2 +mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/libfontenc-1.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libFS-1.0.4.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/X11R7.7/src/everything/libpciaccess-0.13.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libSM-1.2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libX11-1.5.0.tar.bz2 +mirror://xorg/individual/lib/libX11-1.6.0.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/X11R7.7/src/everything/libXcursor-1.1.13.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/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXext-1.3.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXfixes-5.0.tar.bz2 +mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2 +mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXfont-1.4.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXi-1.6.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXinerama-1.1.2.tar.bz2 +mirror://xorg/individual/lib/libXi-1.7.1.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.0.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXrender-0.9.7.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXres-1.0.6.tar.bz2 +mirror://xorg/individual/lib/libXrandr-1.4.1.tar.bz2 +mirror://xorg/individual/lib/libXrender-0.9.7.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/X11R7.7/src/everything/libXt-1.1.3.tar.bz2 +mirror://xorg/individual/lib/libXt-1.1.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXtst-1.2.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXv-1.0.7.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXvMC-1.0.7.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXxf86dga-1.1.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/libXxf86vm-1.1.2.tar.bz2 +mirror://xorg/individual/lib/libXv-1.0.8.tar.bz2 +mirror://xorg/individual/lib/libXvMC-1.0.7.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/X11R7.7/src/everything/mkfontdir-1.0.7.tar.bz2 @@ -135,7 +135,7 @@ mirror://xorg/individual/driver/xf86-video-mga-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 -mirror://xorg/individual/driver/xf86-video-openchrome-0.3.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-r128-6.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-savage-2.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.7.tar.bz2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3401e3c57c4..e04ecaf7a05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5794,7 +5794,7 @@ let xinetd = callPackage ../servers/xinetd { }; xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { - inherit fetchurl fetchsvn stdenv pkgconfig intltool freetype fontconfig + inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig libxslt expat libdrm libpng zlib perl mesa_drivers xkeyboard_config dbus libuuid openssl gperf m4 autoconf libtool xmlto asciidoc udev flex bison python mtdev;