From 662600c241cc5d6b04503f0c2c7f39c7e043036d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:51:13 +0000 Subject: [PATCH 01/50] * Updated various X.org packages, including libX11. svn path=/nixpkgs/branches/x-updates/; revision=22632 --- pkgs/servers/x11/xorg/default.nix | 178 +++++++++--------- pkgs/servers/x11/xorg/extra.list | 7 +- .../x11/xorg/generate-expr-from-tarballs.pl | 1 + pkgs/servers/x11/xorg/old.list | 7 +- pkgs/servers/x11/xorg/tarballs-7.5.list | 36 ++-- 5 files changed, 115 insertions(+), 114 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 84de382d19c..ad4796c16d7 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -68,11 +68,11 @@ let })) // {inherit ;}; dri2proto = (stdenv.mkDerivation ((if overrides ? dri2proto then overrides.dri2proto else x: x) { - name = "dri2proto-2.2"; + name = "dri2proto-2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/dri2proto-2.2.tar.bz2; - sha256 = "18djh2vy6z67hl1v63wc1kw7q35s92ixj5p2lffpshz4zq7ralpk"; + url = mirror://xorg/individual/proto/dri2proto-2.3.tar.bz2; + sha256 = "0xz6nf5rrn1fvply5mq7dd1w89r73mggylp9lpzzwdfvl291h55j"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -498,11 +498,11 @@ let })) // {inherit libICE xproto ;}; imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) { - name = "imake-1.0.2"; + name = "imake-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/imake-1.0.2.tar.bz2; - sha256 = "0yxca3hbz4hfk0fm385lbm89061p2nksr5klx2y3x1knmvsgzklp"; + url = mirror://xorg/individual/util/imake-1.0.3.tar.bz2; + sha256 = "1sjknp0g39r7ywp44drcrb8r92159a9nxgnjc90mjcksvm2540ch"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; @@ -578,11 +578,11 @@ let })) // {inherit windowswmproto libX11 libXext xextproto ;}; libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) { - name = "libX11-1.3.2"; + name = "libX11-1.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libX11-1.3.2.tar.bz2; - sha256 = "1cmwnk3k4dsirg895rrz7pmcsjjrai8ng7gjy68dd1ffkxf4vvsd"; + url = mirror://xorg/individual/lib/libX11-1.3.4.tar.bz2; + sha256 = "0i58i744fh9jp0wdyifc9ip5ahvanniyfzana0s15kgpwn627mw8"; }; buildInputs = [pkgconfig bigreqsproto inputproto kbproto libXau libxcb xcmiscproto libXdmcp xextproto xf86bigfontproto xproto xtrans ]; })) // {inherit bigreqsproto inputproto kbproto libXau libxcb xcmiscproto libXdmcp xextproto xf86bigfontproto xproto xtrans ;}; @@ -618,11 +618,11 @@ let })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;}; libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) { - name = "libXcomposite-0.4.1"; + name = "libXcomposite-0.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXcomposite-0.4.1.tar.bz2; - sha256 = "04vs1ml9y60g8046kg79wn71455m2c8xn1c88sq8wb92cmas459p"; + url = mirror://xorg/individual/lib/libXcomposite-0.4.2.tar.bz2; + sha256 = "007qcqhp0dhvq2v7nkpz282rbwa6m9pmmpg4ypb30hv8yw5xwas4"; }; buildInputs = [pkgconfig compositeproto fixesproto libX11 libXext libXfixes xproto ]; })) // {inherit compositeproto fixesproto libX11 libXext libXfixes xproto ;}; @@ -638,11 +638,11 @@ let })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;}; libXdamage = (stdenv.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) { - name = "libXdamage-1.1.2"; + name = "libXdamage-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXdamage-1.1.2.tar.bz2; - sha256 = "02kwzk41a2b9wmlvrivz7nhbl15vihrjla7fl38w89s8nfn10sm5"; + url = mirror://xorg/individual/lib/libXdamage-1.1.3.tar.bz2; + sha256 = "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw"; }; buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ]; })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;}; @@ -658,31 +658,31 @@ let })) // {inherit xproto ;}; libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) { - name = "libXext-1.1.1"; + name = "libXext-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXext-1.1.1.tar.bz2; - sha256 = "1cwv3sllfk1xwc7gkld8ifyxrgkl3j0d1539amcnda5kgyyf630i"; + url = mirror://xorg/individual/lib/libXext-1.1.2.tar.bz2; + sha256 = "0x2gzqrdzdzyrw8h9qz4ml8yyplb5ki78pvf17ibdjajkkv0ysmc"; }; buildInputs = [pkgconfig libX11 xextproto xproto ]; })) // {inherit libX11 xextproto xproto ;}; libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) { - name = "libXfixes-4.0.4"; + name = "libXfixes-4.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXfixes-4.0.4.tar.bz2; - sha256 = "0j1vwd5jwqc6wzv2jz18al2qdzm7k9kgs2x5rcq7r461qpjxfcds"; + url = mirror://xorg/individual/lib/libXfixes-4.0.5.tar.bz2; + sha256 = "0x4drdxrslxf4vgcfyba0f0fbxg98c8x5dfrl7azakhf8qhd0v1f"; }; buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ]; })) // {inherit fixesproto libX11 xextproto xproto ;}; libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) { - name = "libXfont-1.4.1"; + name = "libXfont-1.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXfont-1.4.1.tar.bz2; - sha256 = "0ybndzh6hc9l8arvvc6j5cbbby52b9n5654r9kndx60bh8qgqaqi"; + url = mirror://xorg/individual/lib/libXfont-1.4.2.tar.bz2; + sha256 = "0ns99rhfz29y6bbc8slfaxjr132bb9x072vnhgv2kzfbk62mlpyh"; }; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; @@ -704,7 +704,7 @@ let url = mirror://xorg/X11R7.5/src/everything/libXi-1.3.tar.bz2; sha256 = "0jwl19w8ry30v4wyar3fv9xbhzp3fbx1mq6p7c342s1qc068qarn"; }; - buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto xmlto asciidoc ]; + buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ]; })) // {inherit inputproto libX11 libXext xextproto xproto ;}; libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) { @@ -758,11 +758,11 @@ let })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; libXrender = (stdenv.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) { - name = "libXrender-0.9.5"; + name = "libXrender-0.9.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXrender-0.9.5.tar.bz2; - sha256 = "1mfmbvq3xsx81zd1fj595b8ar2asdva4lvxcrdsbdqjbi91r01dw"; + url = mirror://xorg/individual/lib/libXrender-0.9.6.tar.bz2; + sha256 = "0s567qgys8m6782lbrpvpscm8fkk2jm2717g7s3hm7hhcgib2n3z"; }; buildInputs = [pkgconfig renderproto libX11 xproto ]; })) // {inherit renderproto libX11 xproto ;}; @@ -778,11 +778,11 @@ let })) // {inherit resourceproto libX11 libXext xextproto xproto ;}; libXt = (stdenv.mkDerivation ((if overrides ? libXt then overrides.libXt else x: x) { - name = "libXt-1.0.7"; + name = "libXt-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXt-1.0.7.tar.bz2; - sha256 = "1v59vll1jy4g2c3jpljj1xyw4nggqpn6jlnffiglbj31n1454vbh"; + url = mirror://xorg/individual/lib/libXt-1.0.8.tar.bz2; + sha256 = "0z03nbb0lhxshpnyx2nl9kw0n3civjkag1mfiqf82qc64n0jrxbh"; }; buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ]; })) // {inherit libICE kbproto libSM libX11 xproto ;}; @@ -888,11 +888,11 @@ let })) // {inherit ;}; libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) { - name = "libxcb-1.4"; + name = "libxcb-1.6"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/libxcb-1.4.tar.bz2; - sha256 = "17i0sfm66gkqycsyr6iw5q16fbf8qp0sw39ir1nv1gp4vp9y5dh7"; + url = http://xcb.freedesktop.org/dist/libxcb-1.6.tar.bz2; + sha256 = "0di9mm6d8wmscgfaw6sfa8znrk522y8dnl4xhy87wqx4fhbwirhs"; }; buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ]; })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;}; @@ -958,11 +958,11 @@ let })) // {inherit libfontenc freetype xproto zlib ;}; pixman = (stdenv.mkDerivation ((if overrides ? pixman then overrides.pixman else x: x) { - name = "pixman-0.16.4"; + name = "pixman-0.18.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/pixman-0.16.4.tar.bz2; - sha256 = "07ndvwxmkrc4zyxpi8ndjmyj509cm411ajrc6qj6clr5y5c96vi9"; + url = mirror://xorg/individual/lib/pixman-0.18.2.tar.bz2; + sha256 = "08rr88cy33k427vyxryxa9yssfy6j9s9m1vcvqmjl2949qv63818"; }; buildInputs = [pkgconfig perl ]; })) // {inherit perl ;}; @@ -1068,11 +1068,11 @@ let })) // {inherit libICE libSM libX11 libXext libXmu libXt ;}; utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) { - name = "util-macros-1.3.0"; + name = "util-macros-1.10.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/util-macros-1.3.0.tar.bz2; - sha256 = "1akibdzirycdz1p2z7awngrqan7cc1waxq497jsgc10zp5ssm6bc"; + url = mirror://xorg/individual/util/util-macros-1.10.0.tar.bz2; + sha256 = "0a8in00qqyksij66wgk1m1cp6n4lii88a0c6g1s7cqshwp5b6lmr"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; @@ -1138,11 +1138,11 @@ let })) // {inherit ;}; xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) { - name = "xcb-proto-1.5"; + name = "xcb-proto-1.6"; builder = ./builder.sh; src = fetchurl { - url = http://xcb.freedesktop.org/dist/xcb-proto-1.5.tar.bz2; - sha256 = "0f269j48h545pp99j316ab0wmriyr8xfz5ykrcxpfclgiqjmpwqc"; + url = http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.bz2; + sha256 = "18jwkgd2ayvd0zzwawnbh86b4xqjq29mgsq44h06yj8jkcaw2azm"; }; buildInputs = [pkgconfig python ]; })) // {inherit python ;}; @@ -1206,16 +1206,16 @@ let }; buildInputs = [pkgconfig libXcursor ]; })) // {inherit libXcursor ;}; - + xdm = (stdenv.mkDerivation ((if overrides ? xdm then overrides.xdm else x: x) { - name = "xdm-1.1.9"; + name = "xdm-1.1.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xdm-1.1.9.tar.bz2; - sha256 = "0d5i25mn6vzhkh5ga5b403hgfmaf66q40knr06ii608d3c7dpcg7"; + url = mirror://xorg/individual/app/xdm-1.1.10.tar.bz2; + sha256 = "0zzrlkmppy6mma49db2x1il47rhjqkg9rs91ryl7xyv5iqbgg1ql"; }; - buildInputs = [pkgconfig libXmu libX11 libXau libXinerama libXft libXpm libXaw libXdmcp libXt libXext]; - })) // {inherit libXmu libX11 libXau libXinerama libXft libXpm libXaw libXdmcp libXt libXext;}; + buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ]; + })) // {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.1.0"; @@ -1318,14 +1318,14 @@ let })) // {inherit inputproto randrproto xorgserver xproto ;}; xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) { - name = "xf86-input-evdev-2.3.2"; + name = "xf86-input-evdev-2.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.3.2.tar.bz2; - sha256 = "0a2y26fq3h1j5c16r8lhparvkr2rbah9f4jc70zcqfq1pmlz96q2"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.4.0.tar.bz2; + sha256 = "0sl02sx755j5kg9sd762sgqk2gnvkhj3pm76l47qhw0a2jvqmx4f"; }; - buildInputs = [pkgconfig xorgserver xproto ]; - })) // {inherit xorgserver xproto ;}; + buildInputs = [pkgconfig inputproto xorgserver xproto ]; + })) // {inherit inputproto xorgserver xproto ;}; xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) { name = "xf86-input-joystick-1.4.99.2"; @@ -1528,14 +1528,14 @@ let })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) { - name = "xf86-video-intel-2.11.0"; + name = "xf86-video-intel-2.12.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.11.0.tar.bz2; - sha256 = "0kss9xpk160j13yvcb0s0k5hhvzcqmhplscmfwsk5cgk4ny2qafv"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.12.0.tar.bz2; + sha256 = "1pzzzpw0i55m6s48ac8c3a0453rskqrdb4v6s9dq5bvj3ywpysz1"; }; - buildInputs = [pkgconfig dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto libXfixes xineramaproto xorgserver xproto libXvMC ]; - })) // {inherit dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libXext xextproto xf86driproto libXfixes xineramaproto xorgserver xproto libXvMC ;}; + buildInputs = [pkgconfig dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; + })) // {inherit dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { name = "xf86-video-mach64-6.8.2"; @@ -1798,14 +1798,14 @@ 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-10.16.9"; + name = "xf86-video-vmware-11.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-10.16.9.tar.bz2; - sha256 = "1hcbgqb7lfcfwrvdscg9jzh1g5vhvc4vsj1sjsywnds8nm2mwnl3"; + url = mirror://xorg/individual/driver/xf86-video-vmware-11.0.1.tar.bz2; + sha256 = "1gp7gj1a1jdcqr8qa9z57h1zjf0wjhr78b7fyxbl9fl1rdd1sdx6"; }; - buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; - })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; + buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; + })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) { name = "xf86-video-voodoo-1.2.3"; @@ -1898,21 +1898,21 @@ let })) // {inherit ;}; xinit = (stdenv.mkDerivation ((if overrides ? xinit then overrides.xinit else x: x) { - name = "xinit-1.2.0"; + name = "xinit-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xinit-1.2.0.tar.bz2; - sha256 = "0zq8cpxm1ws81xj39d0wfv29f1nj7s3pmjdashr32x918hx6cqdb"; + url = mirror://xorg/individual/app/xinit-1.2.1.tar.bz2; + sha256 = "01wvdi69v9yadzavch6l8c80v1rqgxsyl6cl3byq0v8vx0xcgg0n"; }; buildInputs = [pkgconfig libX11 ]; })) // {inherit libX11 ;}; xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) { - name = "xinput-1.5.0"; + name = "xinput-1.5.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xinput-1.5.0.tar.bz2; - sha256 = "1yfazyhjdy49fwdlzxximbapliniibs8jm0vripd7vdm9gijhix8"; + url = mirror://xorg/individual/app/xinput-1.5.2.tar.bz2; + sha256 = "1433lw6xv59f240rgrpgyf9qrmh9knpx64gg95bm32cjvh0qdrrc"; }; buildInputs = [pkgconfig inputproto libX11 libXext libXi ]; })) // {inherit inputproto libX11 libXext libXi ;}; @@ -1958,31 +1958,31 @@ let })) // {inherit libX11 libXmu ;}; xlsatoms = (stdenv.mkDerivation ((if overrides ? xlsatoms then overrides.xlsatoms else x: x) { - name = "xlsatoms-1.0.2"; + name = "xlsatoms-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xlsatoms-1.0.2.tar.bz2; - sha256 = "06qjbhph27jwbp7w5iiqk6ka6h2g2nk5x9x8ilpab8jy5rldfv6n"; + url = mirror://xorg/individual/app/xlsatoms-1.1.0.tar.bz2; + sha256 = "03fbknvq7rixfgpv5945s7r82jz2xc06a0n09w1p22hl4pd7l0aa"; }; - buildInputs = [pkgconfig libX11 libXmu ]; - })) // {inherit libX11 libXmu ;}; + buildInputs = [pkgconfig libxcb ]; + })) // {inherit libxcb ;}; xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) { - name = "xlsclients-1.0.2"; + name = "xlsclients-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xlsclients-1.0.2.tar.bz2; - sha256 = "163ni1f71gq24gm83pmqha81r44qprqv7j2b07gngk2gkp9cs9w5"; + url = mirror://xorg/individual/app/xlsclients-1.1.0.tar.bz2; + sha256 = "037sph4zyar6061445xmf1bqrmm00k6qr9lpypjnrx4ragsm2nzr"; }; - buildInputs = [pkgconfig libX11 libXmu ]; - })) // {inherit libX11 libXmu ;}; + buildInputs = [pkgconfig libxcb ]; + })) // {inherit libxcb ;}; xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) { - name = "xmessage-1.0.2"; + name = "xmessage-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmessage-1.0.2.tar.bz2; - sha256 = "1hy3n227iyrm323hnrdld8knj9h82fz6s7x6bw899axcjdp03d02"; + url = mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2; + sha256 = "0nrxidff0pcd1ampfzj91ai74j6mx613j5kqk3j0c4xdshx5v8yg"; }; buildInputs = [pkgconfig libXaw libXt ]; })) // {inherit libXaw libXt ;}; @@ -2018,11 +2018,11 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.7.5"; + name = "xorg-server-1.7.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.7.5.tar.bz2; - sha256 = "1ampdfdijwafzlpq9jwxaxwwq40j0ymvcd922bs70wiybk8g7rci"; + url = mirror://xorg/individual/xserver/xorg-server-1.7.7.tar.bz2; + sha256 = "1zr63701gii6aarxj9016gdymhiv3ycfdnixxbdjm1dqzqmx7i2l"; }; buildInputs = [pkgconfig bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ]; })) // {inherit bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;}; @@ -2058,11 +2058,11 @@ let })) // {inherit libX11 ;}; xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) { - name = "xproto-7.0.16"; + name = "xproto-7.0.17"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xproto-7.0.16.tar.bz2; - sha256 = "0wlnxg51mz9zrdsx2zxr5mw56i5vcbnz69d30x7fs3cww4fdl942"; + url = mirror://xorg/individual/proto/xproto-7.0.17.tar.bz2; + sha256 = "00cxgwaijhz7vp60washz03nvwk42f7sz72xkzfcx01pbgf1yb4v"; }; buildInputs = [pkgconfig ]; })) // {inherit ;}; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index e930e14e801..405e041545d 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -1,6 +1,5 @@ -http://xcb.freedesktop.org/dist/xcb-proto-1.5.tar.bz2 +http://xcb.freedesktop.org/dist/xcb-proto-1.6.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-0.3.6.tar.bz2 -http://xcb.freedesktop.org/dist/libxcb-1.4.tar.bz2 +http://xcb.freedesktop.org/dist/libxcb-1.6.tar.bz2 http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2 -mirror://xorg/individual/lib/pixman-0.16.4.tar.bz2 -mirror://xorg/individual/app/xdm-1.1.9.tar.bz2 +mirror://xorg/individual/lib/pixman-0.18.2.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 e3473fa6b14..ff6d3815bb5 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -193,6 +193,7 @@ while (<>) { process \@requires, $1 while $file =~ /REQUIRED_LIBS=\"(.*)\"/g; process \@requires, $1 while $file =~ /REQUIRED_MODULES=\"(.*)\"/g; process \@requires, $1 while $file =~ /REQUIRES=\"(.*)\"/g; + process \@requires, $1 while $file =~ /X11_REQUIRES=\'(.*)\'/g; process \@requires, $1 while $file =~ /XDMCP_MODULES=\"(.*)\"/g; process \@requires, $1 while $file =~ /XORG_MODULES=\"(.*)\"/g; process \@requires, $1 while $file =~ /NEEDED=\"(.*)\"/g; diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list index 6599c79af53..b54159cf220 100644 --- a/pkgs/servers/x11/xorg/old.list +++ b/pkgs/servers/x11/xorg/old.list @@ -1,14 +1,15 @@ mirror://xorg/individual/app/twm-1.0.4.tar.bz2 mirror://xorg/individual/app/xclock-1.0.4.tar.bz2 +mirror://xorg/individual/app/xdm-1.1.10.tar.bz2 mirror://xorg/individual/app/xeyes-1.1.0.tar.bz2 mirror://xorg/individual/app/xfs-1.1.0.tar.bz2 -mirror://xorg/individual/app/xinit-1.2.0.tar.bz2 -mirror://xorg/individual/app/xmessage-1.0.2.tar.bz2 +mirror://xorg/individual/app/xinit-1.2.1.tar.bz2 +mirror://xorg/individual/app/xmessage-1.0.3.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.0.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.2.tar.bz2 mirror://xorg/individual/proto/printproto-1.0.4.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.2.tar.bz2 +mirror://xorg/individual/util/imake-1.0.3.tar.bz2 mirror://xorg/individual/util/lndir-1.0.1.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.3.tar.bz2 diff --git a/pkgs/servers/x11/xorg/tarballs-7.5.list b/pkgs/servers/x11/xorg/tarballs-7.5.list index fd0ce8edb56..d702fdc69c5 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.5.list +++ b/pkgs/servers/x11/xorg/tarballs-7.5.list @@ -4,7 +4,7 @@ mirror://xorg/X11R7.5/src/everything/bigreqsproto-1.1.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/compositeproto-0.4.1.tar.bz2 mirror://xorg/X11R7.5/src/everything/damageproto-1.2.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/dmxproto-2.3.tar.bz2 -mirror://xorg/individual/proto/dri2proto-2.2.tar.bz2 +mirror://xorg/individual/proto/dri2proto-2.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/encodings-1.0.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/fixesproto-4.1.1.tar.bz2 mirror://xorg/X11R7.5/src/everything/font-adobe-100dpi-1.0.1.tar.bz2 @@ -56,16 +56,16 @@ mirror://xorg/X11R7.5/src/everything/libICE-1.0.6.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.11.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/libSM-1.1.1.tar.bz2 mirror://xorg/X11R7.5/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libX11-1.3.2.tar.bz2 +mirror://xorg/individual/lib/libX11-1.3.4.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXau-1.0.5.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXaw-1.0.7.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXcomposite-0.4.1.tar.bz2 +mirror://xorg/individual/lib/libXcomposite-0.4.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXcursor-1.1.10.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXdamage-1.1.2.tar.bz2 +mirror://xorg/individual/lib/libXdamage-1.1.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXdmcp-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXext-1.1.1.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXfixes-4.0.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXfont-1.4.1.tar.bz2 +mirror://xorg/individual/lib/libXext-1.1.2.tar.bz2 +mirror://xorg/individual/lib/libXfixes-4.0.5.tar.bz2 +mirror://xorg/individual/lib/libXfont-1.4.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXft-2.1.14.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXi-1.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXinerama-1.1.tar.bz2 @@ -73,10 +73,10 @@ mirror://xorg/X11R7.5/src/everything/libxkbfile-1.0.6.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXmu-1.0.5.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXpm-3.5.8.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXrandr-1.3.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXrender-0.9.5.tar.bz2 +mirror://xorg/individual/lib/libXrender-0.9.6.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXres-1.0.4.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXScrnSaver-1.2.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXt-1.0.7.tar.bz2 +mirror://xorg/individual/lib/libXt-1.0.8.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXtst-1.1.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXv-1.0.5.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXvMC-1.0.5.tar.bz2 @@ -94,7 +94,7 @@ mirror://xorg/X11R7.5/src/everything/scrnsaverproto-1.2.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/sessreg-1.0.5.tar.bz2 mirror://xorg/X11R7.5/src/everything/setxkbmap-1.1.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/smproxy-1.0.3.tar.bz2 -mirror://xorg/X11R7.5/src/everything/util-macros-1.3.0.tar.bz2 +mirror://xorg/individual/util/util-macros-1.10.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/videoproto-2.3.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/windowswmproto-1.0.4.tar.bz2 mirror://xorg/X11R7.5/src/everything/x11perf-1.5.1.tar.bz2 @@ -114,7 +114,7 @@ mirror://xorg/X11R7.5/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86driproto-2.1.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-acecad-1.4.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-aiptek-1.3.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.3.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.4.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-joystick-1.4.99.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-keyboard-1.4.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-input-mouse-1.5.0.tar.bz2 @@ -134,7 +134,7 @@ mirror://xorg/X11R7.5/src/everything/xf86-video-glide-1.0.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-glint-1.2.4.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-i128-1.3.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-i740-1.3.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.10.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.12.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-mach64-6.8.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-mga-1.4.11.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-neomagic-1.2.4.tar.bz2 @@ -161,7 +161,7 @@ mirror://xorg/X11R7.5/src/everything/xf86-video-trident-1.3.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-tseng-1.2.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-vmware-10.16.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-vmware-11.0.1.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-voodoo-1.2.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-wsfb-0.3.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xf86-video-xgi-1.5.1.tar.bz2 @@ -170,20 +170,20 @@ mirror://xorg/X11R7.5/src/everything/xf86vidmodeproto-2.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xgamma-1.0.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xhost-1.0.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xineramaproto-1.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xinput-1.5.0.tar.bz2 +mirror://xorg/individual/app/xinput-1.5.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/xkbcomp-1.1.1.tar.bz2 mirror://xorg/X11R7.5/src/everything/xkbevd-1.1.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xkbutils-1.0.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/xkill-1.0.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xlsatoms-1.0.2.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xlsclients-1.0.2.tar.bz2 +mirror://xorg/individual/app/xlsatoms-1.1.0.tar.bz2 +mirror://xorg/individual/app/xlsclients-1.1.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xmodmap-1.0.4.tar.bz2 mirror://xorg/X11R7.5/src/everything/xorg-docs-1.5.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.7.5.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.7.7.tar.bz2 mirror://xorg/X11R7.5/src/everything/xorg-sgml-doctools-1.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xpr-1.0.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xprop-1.1.0.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xproto-7.0.16.tar.bz2 +mirror://xorg/individual/proto/xproto-7.0.17.tar.bz2 mirror://xorg/X11R7.5/src/everything/xrandr-1.3.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/xrdb-1.0.6.tar.bz2 mirror://xorg/X11R7.5/src/everything/xrefresh-1.0.3.tar.bz2 From 8e168422fb11d6ef5d2b686066f5c05a0623bde1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:51:33 +0000 Subject: [PATCH 02/50] * xkeyboard-config updated to 1.9. svn path=/nixpkgs/branches/x-updates/; revision=22633 --- pkgs/data/misc/xkeyboard-config/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix index 4fb3a68f5d1..61fc028f543 100644 --- a/pkgs/data/misc/xkeyboard-config/default.nix +++ b/pkgs/data/misc/xkeyboard-config/default.nix @@ -1,21 +1,17 @@ {stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}: -let version = "1.5"; in - -stdenv.mkDerivation { - name = "xkeyboard-config-${version}"; +stdenv.mkDerivation rec { + name = "xkeyboard-config-1.9"; src = fetchurl { - url = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${version}.tar.bz2"; - sha256 = "1r276ik3x0jg77zza37ggrnp7zbdvmjyrm9mwxxgzh3bmligy5ff"; + url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2"; + sha256 = "0df2iad598pxw3fzkx10f7irqah0fgawx262d07s04x0whn9ql9b"; }; buildInputs = [perl perlXMLParser xkbcomp gettext intltool]; patches = [ ./eo.patch ]; - ICONV = "iconv"; - preConfigure = '' configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86" sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh From e0dd4232e106e0f665e6a1a2da19ca0602476e45 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:51:53 +0000 Subject: [PATCH 03/50] * libjpeg updated to v8b. svn path=/nixpkgs/branches/x-updates/; revision=22634 --- pkgs/development/libraries/libjpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index bc3245cf76d..d31bc260509 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "libjpeg-8"; src = fetchurl { - url = http://www.ijg.org/files/jpegsrc.v8.tar.gz; - sha256 = "1b0blpk8v397klssk99l6ddsb64krcb29pbkbp8ziw5kmjvsbfhp"; + url = http://www.ijg.org/files/jpegsrc.v8b.tar.gz; + sha256 = "19vl6587pyhz45f14yipnsnpni4iz6j0wdzwyblbm4f5vs721rin"; }; meta = { From 8acd56744f1f1f3796033cb6be31991258b06f3b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:52:10 +0000 Subject: [PATCH 04/50] * HAL updated to 0.5.14. svn path=/nixpkgs/branches/x-updates/; revision=22635 --- pkgs/os-specific/linux/hal/default.nix | 5 ++--- pkgs/os-specific/linux/hal/info.nix | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/hal/default.nix b/pkgs/os-specific/linux/hal/default.nix index e764a1afca2..2f830ab0131 100644 --- a/pkgs/os-specific/linux/hal/default.nix +++ b/pkgs/os-specific/linux/hal/default.nix @@ -3,17 +3,16 @@ , perlXMLParser, gettext, zlib, gperf, consolekit, policykit , libsmbios, dmidecode, udev, utillinuxng, pmutils, usbutils , eject -, ... }: assert stdenv ? glibc; stdenv.mkDerivation rec { - name = "hal-0.5.13"; + name = "hal-0.5.14"; src = fetchurl { url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1by8z7vy1c1m3iyh57rlqx6rah5gj6kx3ba30s9305bnffij5kzb"; + sha256 = "00ld3afcbh4ckb8sli63mm2w69zh6ip4axhy1lxyybgiabxaqfij"; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/hal/info.nix b/pkgs/os-specific/linux/hal/info.nix index 92677e3edae..1a4e41c776f 100644 --- a/pkgs/os-specific/linux/hal/info.nix +++ b/pkgs/os-specific/linux/hal/info.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig}: stdenv.mkDerivation rec { - name = "hal-info-20090716"; + name = "hal-info-20091130"; src = fetchurl { url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "179m2ip79jpr1mrmbcm2nx7l1mjlwcfmlw4ycd4dh0jrib64m3sp"; + sha256 = "092jhzpxa2h8djf8pijql92m70q87yds22686ryrfna3xbm90niv"; }; meta = { From 32a8fbde4f7aa49455406a414f0ef86399fb2bb4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:52:25 +0000 Subject: [PATCH 05/50] * CUPS updated to 1.4.4. svn path=/nixpkgs/branches/x-updates/; revision=22636 --- pkgs/misc/cups/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 0b8830a7bdc..2c363ed80d5 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,23 +1,16 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl , dbus, libusb }: -let version = "1.4.1"; in +let version = "1.4.4"; in stdenv.mkDerivation { name = "cups-${version}"; src = fetchurl { url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"; - sha256 = "1fnkq993hr8l87x6f7a7wik2spac3f7nn4wksrvwk690r8a6zxng"; + md5 = "8776403ad60fea9e85eab9c04d88560d"; }; - patches = - [ (fetchurl { - url = http://www.cups.org/strfiles/3332/0001-Fixed-side_cb-function-declaration-in-usb-unix.c.patch; - sha256 = "0h8fhhpzp7xngnc428040jv09yvpz5dxb9hw6sv67lnvb03fncnw"; - }) - ]; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff pam dbus libusb ]; propagatedBuildInputs = [ openssl ]; From b7324318cfe2bed564c8a94764755d879b99b4f3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:52:39 +0000 Subject: [PATCH 06/50] * zlib updated to 1.2.5. svn path=/nixpkgs/branches/x-updates/; revision=22637 --- pkgs/development/libraries/zlib/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 95c891e9bc7..df834f9f885 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,11 +1,13 @@ {stdenv, fetchurl, static ? false}: -stdenv.mkDerivation { - name = "zlib-1.2.3"; +stdenv.mkDerivation rec { + name = "zlib-1.2.5"; + src = fetchurl { - url = http://www.zlib.net/zlib-1.2.3.tar.gz; - md5 = "debc62758716a169df9f62e6ab2bc634"; + url = "http://www.zlib.net/${name}.tar.gz"; + sha256 = "0n7rlgvjn73pyil3s1l6p77m7wkc809n934rnzxv1b1za4pfar30"; }; + configureFlags = if static then "" else "--shared"; preConfigure = '' From ef8bf2b0771abd6b4a18485d20313a482eb80547 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:53:58 +0000 Subject: [PATCH 07/50] * FreeType updated to 2.4.1. Note that the bytecode interpreter patent has expired, so TT_CONFIG_OPTION_BYTECODE_INTERPRETER is now the default. Whether it looks better now is subjective. svn path=/nixpkgs/branches/x-updates/; revision=22638 --- .../libraries/freetype/default.nix | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index d3814bdb972..cac14642a3f 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,31 +1,29 @@ { stdenv, fetchurl -, # FreeType supports hinting using a TrueType bytecode interpreter, - # as well as sub-pixel rendering. These are patented by Apple and - # Microsoft, respectively, so they are disabled by default. This - # option allows them to be enabled. See - # http://www.freetype.org/patents.html. +, # FreeType supports sub-pixel rendering. This is patented by + # Microsoft, so it is disabled by default. This option allows it to + # be enabled. See http://www.freetype.org/patents.html. useEncumberedCode ? false }: -stdenv.mkDerivation (rec { - name = "freetype-2.3.11"; +stdenv.mkDerivation rec { + name = "freetype-2.4.1"; src = fetchurl { url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "1j9f3q7vkdhlcxmfhkkyvxmniih2gcsb428v73mfk88qc0g3n0wa"; + sha256 = "0gmyk6w7rbiiw7zjbyvkvp8wfl7q9n5576ifqq67qwsjdzlm9ja5"; }; configureFlags = "--disable-static"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString useEncumberedCode - "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1 -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER=1"; + "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1"; + + # The asm for armel is written with the 'asm' keyword. + CFLAGS = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "-std=gnu99"; meta = { description = "A font rendering engine"; homepage = http://www.freetype.org/; license = "GPLv2+"; # or the FreeType License (BSD + advertising clause) }; -} // -# The asm for armel is written with the 'asm' keyword. -(if (stdenv.system == "armv5tel-linux") then - {CFLAGS = "-std=gnu99";} else {})) +} \ No newline at end of file From d06a183365d6a0a6ec78856bdb9a86bf6999190f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:54:14 +0000 Subject: [PATCH 08/50] * OpenSSL updated to 1.0.0a. svn path=/nixpkgs/branches/x-updates/; revision=22639 --- pkgs/development/libraries/openssl/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 4e567cf6577..13204f59992 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -6,14 +6,16 @@ let stdenv.cross; in -stdenv.mkDerivation ( rec { - name = "openssl-0.9.8n"; - +stdenv.mkDerivation rec { + name = "openssl-1.0.0a"; + src = fetchurl { url = "http://www.openssl.org/source/${name}.tar.gz"; - sha256 = "008z1h09pa6dfxs4wgbqj5i1clw4v82b1waqvwanb1kb6wlbq6mh"; + sha256 = "0qqgyzfb0alwx329z8bqybzamfl9j2maykykvq6zk3ibq0gvva8q"; }; + patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; + buildNativeInputs = [ perl ]; configureScript = "./config"; @@ -36,4 +38,4 @@ stdenv.mkDerivation ( rec { homepage = http://www.openssl.org/; description = "A cryptographic library that implements the SSL and TLS protocols"; }; -} // (if stdenv.isDarwin then { patches = [./darwin-arch.patch]; } else {}) ) +} From 964c3d351f809b1ab896caf914b2bc6ae0173233 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:54:28 +0000 Subject: [PATCH 09/50] * libtiff updated to 3.9.4. svn path=/nixpkgs/branches/x-updates/; revision=22640 --- pkgs/development/libraries/libtiff/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index e2a25583326..386abb6fbc2 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, zlib, libjpeg }: stdenv.mkDerivation { - name = "libtiff-3.9.1"; + name = "libtiff-3.9.4"; src = fetchurl { - url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.1.tar.gz; - sha256 = "168yssav47xih2y17m7psj4k6ngnfai300bbfznc75hn3crxfdil"; + url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.4.tar.gz; + sha256 = "19hxd773yxcs4lxlc3zfdkz5aiv705vj2jvy5srpqkxpbw3nvdv7"; }; - propagatedBuildInputs = [zlib libjpeg]; + propagatedBuildInputs = [ zlib libjpeg ]; meta = { description = "Library and utilities for working with the TIFF image file format"; From 6b79040a0b6037317b561b5f3e4f1085e3cd3f87 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:54:42 +0000 Subject: [PATCH 10/50] * libpng updated to 1.2.44. svn path=/nixpkgs/branches/x-updates/; revision=22641 --- pkgs/development/libraries/libpng/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 746266b92c7..5448dc136fa 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,23 +1,20 @@ -{stdenv, fetchurl, zlib}: +{ stdenv, fetchurl, zlib }: assert zlib != null; stdenv.mkDerivation rec { - name = "libpng-1.2.42"; + name = "libpng-1.2.44"; src = fetchurl { url = "mirror://sourceforge/libpng/${name}.tar.gz"; - md5 = "562066eb8557db91156eaeb309458488"; + md5 = "89b62f8daaeeab1342e307d6d1411ff1"; }; - propagatedBuildInputs = [zlib]; + propagatedBuildInputs = [ zlib ]; - inherit zlib; - meta = { description = "The official reference implementation for the PNG file format"; homepage = http://www.libpng.org/pub/png/libpng.html; license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt }; } - From 65d9c03c9a67b26882bfafa9e9f314644c96be41 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:54:57 +0000 Subject: [PATCH 11/50] * libdrm updated to 2.4.21. svn path=/nixpkgs/branches/x-updates/; revision=22642 --- pkgs/development/libraries/libdrm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 0b8593279d3..94fb7f96986 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, libpthreadstubs}: stdenv.mkDerivation rec { - name = "libdrm-2.4.18"; + name = "libdrm-2.4.21"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "015nxrb2wvyqlxvwaqq40v46nj96sk71p2n4dh4h5djwzx7v9ign"; + sha256 = "0jx1idd2ycglx81b0nlawh07lgi8k5h9854c9apdxcdnlcmn26sf"; }; buildInputs = [ pkgconfig libpthreadstubs ]; From 70ab33568dfd61967e19d97905476669a27ecd96 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:55:12 +0000 Subject: [PATCH 12/50] * Cairo updated to 1.8.10. svn path=/nixpkgs/branches/x-updates/; revision=22643 --- pkgs/development/libraries/cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index dc8bb2a9b52..5ca74561491 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -11,11 +11,11 @@ assert pngSupport -> libpng != null; assert xcbSupport -> libxcb != null && xcbutil != null; stdenv.mkDerivation rec { - name = "cairo-1.8.8"; + name = "cairo-1.8.10"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.gz"; - sha256 = "140w8pz2k2kmjdaav3rfy009rjf2hqycsnk7lq0nwnf4bpgd6l9w"; + sha1 = "fd5e8ca82ff0e8542ea4c51612cad387f2a49df3"; }; buildInputs = From 02d85d19a252410fd907f641d3d63ad0275d200d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:55:31 +0000 Subject: [PATCH 13/50] * Fontconfig updated to 2.8.0. svn path=/nixpkgs/branches/x-updates/; revision=22644 --- pkgs/development/libraries/fontconfig/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 7e802eb86b8..8e016401e3d 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, freetype, expat}: +{ stdenv, fetchurl, freetype, expat }: stdenv.mkDerivation rec { - name = "fontconfig-2.7.3"; + name = "fontconfig-2.8.0"; src = fetchurl { url = "http://fontconfig.org/release/${name}.tar.gz"; - sha256 = "0l5hjifapv4v88a204ixg6w6xly81cji2cr65znra0vbbkqvz3xs"; + sha256 = "0d9370qnn1qzq0jidbycin2frkcr1kqj04jbgb79ykb5x9p1qaps"; }; - buildInputs = [freetype]; - propagatedBuildInputs = [expat]; # !!! shouldn't be necessary, but otherwise pango breaks + buildInputs = [ freetype ]; + propagatedBuildInputs = [ expat ]; # !!! shouldn't be necessary, but otherwise pango breaks configureFlags = "--with-confdir=/etc/fonts --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts="; From 26521d42e2f6e6ebf50b5792fd1ee8a6352faa25 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 21:56:12 +0000 Subject: [PATCH 14/50] * gtkLibs218 updated (glib-2.22.5, gtk+-2.18.9). svn path=/nixpkgs/branches/x-updates/; revision=22645 --- pkgs/development/libraries/glib/2.22.x.nix | 4 ++-- pkgs/development/libraries/gtk+/2.18.x.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/glib/2.22.x.nix b/pkgs/development/libraries/glib/2.22.x.nix index e6af08cae0e..9148639c2d0 100644 --- a/pkgs/development/libraries/glib/2.22.x.nix +++ b/pkgs/development/libraries/glib/2.22.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gettext, perl, libiconv ? null}: stdenv.mkDerivation rec { - name = "glib-2.22.4"; + name = "glib-2.22.5"; src = fetchurl { url = "mirror://gnome/sources/glib/2.22/${name}.tar.bz2"; - sha256 = "055dv2hymbyzwpcd39r97x747vsvlkyywa826zr75dzambw6n7qd"; + sha256 = "802be9c9ffeb631725ffd6ed35af0af309776729a7fab4fcb48f2b0b8fe7245b"; }; buildInputs = [pkgconfig gettext perl libiconv]; diff --git a/pkgs/development/libraries/gtk+/2.18.x.nix b/pkgs/development/libraries/gtk+/2.18.x.nix index bb329ae8b14..40ba6e13b22 100644 --- a/pkgs/development/libraries/gtk+/2.18.x.nix +++ b/pkgs/development/libraries/gtk+/2.18.x.nix @@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = "gtk+-2.18.6"; + name = "gtk+-2.18.9"; src = fetchurl { url = "mirror://gnome/sources/gtk+/2.18/${name}.tar.bz2"; - sha256 = "0k9mz46q97537kdpmz8j5bhrzpn3zjp7k4mni4niafdp2x4r8aan"; + sha256 = "5dcd8c406acbb8779c0b081a089fa87dfd7ab4d7d4c6075db478997ce96aa9b4"; }; buildNativeInputs = [ perl ]; From d514ac437a1e8bb66cbd3c1b832e2607a2f4b8dc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 22:00:40 +0000 Subject: [PATCH 15/50] * Dbus updated to 1.2.24. svn path=/nixpkgs/branches/x-updates/; revision=22646 --- pkgs/development/libraries/dbus/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index b9d93184076..24c6f409a10 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true}: +{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }: let - version = "1.2.16"; + version = "1.2.24"; src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; - sha256 = "1j742d22ablcgxfxa3hcwf5bq6bd1pba7fiwc3dvnjvcdb0k32ln"; + sha256 = "0j2wb79kndq4b1qqr59n1g6s0lm7yp6r9ny3skimadkh9a7p8b7i"; }; configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp"; @@ -15,7 +15,7 @@ in rec { libs = stdenv.mkDerivation { name = "dbus-library-" + version; - buildInputs = [pkgconfig expat]; + buildInputs = [ pkgconfig expat ]; inherit src configureFlags; @@ -35,8 +35,8 @@ in rec { configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin"; - buildInputs = [pkgconfig expat libs] - ++ stdenv.lib.optionals useX11 [libX11 libICE libSM]; + buildInputs = [ pkgconfig expat libs ] + ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ]; postConfigure = "cd tools"; From 962276dd499e43cea2201fbdf711e44c52df68b0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 23:22:20 +0000 Subject: [PATCH 16/50] * dbus-glib updated to 0.86. svn path=/nixpkgs/branches/x-updates/; revision=22651 --- pkgs/development/libraries/dbus-glib/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index a6d594af0f0..e21a5d66a0e 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,16 +1,16 @@ -args: with args; +{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { - name = "dbus-glib-0.80"; + name = "dbus-glib-0.86"; src = fetchurl { url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; - sha256 = "0nv4gxcbpa9f0907dmzmfm222w8y45z19cx27l85f5qknf8hncxm"; + sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak"; }; - buildInputs = [pkgconfig expat gettext libiconv]; + buildInputs = [ pkgconfig expat gettext libiconv ]; - propagatedBuildInputs = [dbus.libs glib]; + propagatedBuildInputs = [ dbus.libs glib ]; passthru = { inherit dbus glib; }; From 0695a9707c74dc59b405a991f7882661e43110cc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 23:22:59 +0000 Subject: [PATCH 17/50] * GTK+ 2.20, Glib 2.24 etc. svn path=/nixpkgs/branches/x-updates/; revision=22652 --- pkgs/development/libraries/atk/1.30.x.nix | 33 ++++++++++++++ pkgs/development/libraries/glib/2.24.x.nix | 30 +++++++++++++ pkgs/development/libraries/gtk+/2.20.x.nix | 49 +++++++++++++++++++++ pkgs/development/libraries/pango/1.28.x.nix | 32 ++++++++++++++ pkgs/top-level/all-packages.nix | 36 ++++++++++++++- 5 files changed, 179 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/atk/1.30.x.nix create mode 100644 pkgs/development/libraries/glib/2.24.x.nix create mode 100644 pkgs/development/libraries/gtk+/2.20.x.nix create mode 100644 pkgs/development/libraries/pango/1.28.x.nix diff --git a/pkgs/development/libraries/atk/1.30.x.nix b/pkgs/development/libraries/atk/1.30.x.nix new file mode 100644 index 00000000000..4f370fd7a2b --- /dev/null +++ b/pkgs/development/libraries/atk/1.30.x.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, perl, glib }: + +stdenv.mkDerivation rec { + name = "atk-1.30.0"; + + src = fetchurl { + url = "mirror://gnome/sources/atk/1.30/${name}.tar.bz2"; + sha256 = "92b9b1213cafc68fe9c3806273b968c26423237d7b1f631dd83dc5270b8c268c"; + }; + + buildInputs = [ pkgconfig perl ]; + propagatedBuildInputs = [ glib ]; + + meta = { + description = "ATK, the accessibility toolkit"; + + longDescription = '' + ATK is the Accessibility Toolkit. It provides a set of generic + interfaces allowing accessibility technologies such as screen + readers to interact with a graphical user interface. Using the + ATK interfaces, accessibility tools have full access to view and + control running applications. + ''; + + homepage = http://library.gnome.org/devel/atk/; + + license = "LGPLv2+"; + + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; + +} diff --git a/pkgs/development/libraries/glib/2.24.x.nix b/pkgs/development/libraries/glib/2.24.x.nix new file mode 100644 index 00000000000..bc17f4b906c --- /dev/null +++ b/pkgs/development/libraries/glib/2.24.x.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv ? null, zlib }: + +stdenv.mkDerivation rec { + name = "glib-2.24.1"; + + src = fetchurl { + url = "mirror://gnome/sources/glib/2.24/${name}.tar.bz2"; + sha256 = "014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04"; + }; + + buildInputs = [ pkgconfig gettext perl libiconv zlib ]; + + meta = { + description = "GLib, a C library of programming buildings blocks"; + + longDescription = '' + GLib provides the core application building blocks for libraries + and applications written in C. It provides the core object + system used in GNOME, the main loop implementation, and a large + set of utility functions for strings and common data structures. + ''; + + homepage = http://www.gtk.org/; + + license = "LGPLv2+"; + + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gtk+/2.20.x.nix b/pkgs/development/libraries/gtk+/2.20.x.nix new file mode 100644 index 00000000000..38537aae595 --- /dev/null +++ b/pkgs/development/libraries/gtk+/2.20.x.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg +, libpng, cairo, perl, jasper, xlibs +, xineramaSupport ? true +, cupsSupport ? true, cups ? null +}: + +assert xineramaSupport -> xlibs.libXinerama != null; +assert cupsSupport -> cups != null; + +stdenv.mkDerivation rec { + name = "gtk+-2.20.1"; + + src = fetchurl { + url = "mirror://gnome/sources/gtk+/2.20/${name}.tar.bz2"; + sha256 = "0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65"; + }; + + buildNativeInputs = [ perl ]; + buildInputs = [ pkgconfig jasper ]; + + propagatedBuildInputs = + [ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ] + ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama + ++ stdenv.lib.optionals cupsSupport [ cups ]; + + passthru = { inherit libtiff libjpeg libpng; }; + + meta = { + description = "A multi-platform toolkit for creating graphical user interfaces"; + + longDescription = '' + GTK+ is a highly usable, feature rich toolkit for creating + graphical user interfaces which boasts cross platform + compatibility and an easy to use API. GTK+ it is written in C, + but has bindings to many other popular programming languages + such as C++, Python and C# among others. GTK+ is licensed + under the GNU LGPL 2.1 allowing development of both free and + proprietary software with GTK+ without any license fees or + royalties. + ''; + + homepage = http://www.gtk.org/; + + license = "LGPLv2+"; + + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/pango/1.28.x.nix b/pkgs/development/libraries/pango/1.28.x.nix new file mode 100644 index 00000000000..14d425b23a2 --- /dev/null +++ b/pkgs/development/libraries/pango/1.28.x.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }: + +stdenv.mkDerivation rec { + name = "pango-1.28.1"; + + src = fetchurl { + url = "mirror://gnome/sources/pango/1.28/${name}.tar.bz2"; + sha256 = "8f3eaab506f613dd25bb1fa65ea87a145d523d066d90c227bdb3016523451bc2"; + }; + + buildInputs = [ pkgconfig ] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext; + + propagatedBuildInputs = [ x11 glib cairo libpng ]; + + meta = { + description = "A library for laying out and rendering of text, with an emphasis on internationalization"; + + longDescription = '' + Pango is a library for laying out and rendering of text, with an + emphasis on internationalization. Pango can be used anywhere + that text layout is needed, though most of the work on Pango so + far has been done in the context of the GTK+ widget toolkit. + Pango forms the core of text and font handling for GTK+-2.x. + ''; + + homepage = http://www.pango.org/; + license = "LGPLv2+"; + + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b43a5e59582..6fe0bcabfc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4202,7 +4202,7 @@ let inherit (gnome) gtk; }; - gtkLibs = recurseIntoAttrs gtkLibs218; + gtkLibs = recurseIntoAttrs gtkLibs220; glib = gtkLibs.glib; @@ -4285,6 +4285,40 @@ let }; + gtkLibs220 = rec { + + glib = import ../development/libraries/glib/2.24.x.nix { + inherit fetchurl stdenv pkgconfig gettext perl zlib; + libiconv = if (stdenv.system == "i686-freebsd") then libiconv else null; + }; + + glibmm = import ../development/libraries/glibmm/2.22.x.nix { + inherit fetchurl stdenv pkgconfig glib libsigcxx; + }; + + atk = import ../development/libraries/atk/1.30.x.nix { + inherit fetchurl stdenv pkgconfig perl glib; + }; + + pango = import ../development/libraries/pango/1.28.x.nix { + inherit fetchurl stdenv pkgconfig gettext x11 glib cairo libpng; + }; + + pangomm = import ../development/libraries/pangomm/2.26.x.nix { + inherit fetchurl stdenv pkgconfig pango glibmm cairomm libpng; + }; + + gtk = import ../development/libraries/gtk+/2.20.x.nix { + inherit fetchurl stdenv pkgconfig perl jasper glib atk pango + libtiff libjpeg libpng cairo xlibs cups; + }; + + gtkmm = import ../development/libraries/gtkmm/2.18.x.nix { + inherit fetchurl stdenv pkgconfig gtk atk glibmm cairomm pangomm; + }; + + }; + gtkmozembedsharp = import ../development/libraries/gtkmozembed-sharp { inherit fetchurl stdenv mono pkgconfig monoDLLFixer; inherit (gnome) gtk; From fa38234d64932a0e9710abd8dbd4077dff97c6f0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 18 Jul 2010 23:23:16 +0000 Subject: [PATCH 18/50] * Make Firefox 3.6 the default. svn path=/nixpkgs/branches/x-updates/; revision=22653 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6fe0bcabfc8..9754b2b985a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7961,9 +7961,9 @@ let inherit (xlibs) libXinerama; }; - firefox = firefox35; + firefox = firefox36; - firefoxWrapper = firefox35Wrapper; + firefoxWrapper = firefox36Wrapper; firefox35Pkgs = import ../applications/networking/browsers/firefox/3.5.nix { inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo From cb4a88368300fd600cafa4fe4b41456822ca7713 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 08:17:42 +0000 Subject: [PATCH 19/50] * Update libxml2 to 2.7.7. This is necessary because of the zlib update - xsltproc segfaults otherwise. (From the release notes: "libxml violates the zlib interface and crashes".) svn path=/nixpkgs/branches/x-updates/; revision=22655 --- pkgs/development/libraries/libxml2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index af591fbef7d..fe3b6bd6487 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -3,11 +3,11 @@ assert pythonSupport -> python != null; stdenv.mkDerivation { - name = "libxml2-2.7.6"; + name = "libxml2-2.7.7"; src = fetchurl { - url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.6.tar.gz; - sha256 = "0n61rqqfiv0m64p01cwx205i6hb0mmzf7r0ya40s4fiqd2nhkkg0"; + url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.7.tar.gz; + sha256 = "03kkknm7xl77qfdig8mzalsi8ljsyblzin18gy3h8zranffrpyzs"; }; configureFlags = '' From ee182f843f94145bc2bf957c7202d41234e6538a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 08:25:09 +0000 Subject: [PATCH 20/50] * Urgh, riverbankcomputing.co.uk constantly removed old releases. We should mirror them. svn path=/nixpkgs/branches/x-updates/; revision=22656 --- pkgs/development/python-modules/pyqt/default.nix | 6 +++--- pkgs/development/python-modules/python-sip/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index 820e272dee1..e9d9ee76064 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, python, sip, qt4}: stdenv.mkDerivation { - name = "pyqt-x11-gpl-4.7.3"; + name = "pyqt-x11-gpl-4.7.4"; src = fetchurl { - url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.3.tar.gz; - sha256 = "0p12m2rjsm3igpqqmgn79my2h16vhxq8dma9ih1744hpnirdcjjp"; + url = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.4.tar.gz; + sha256 = "0a7iqzp75hd29rvwhyqfmaj5ymd49wq8scysjkivhc5qkx5rh00r"; }; configurePhase = "python ./configure.py --confirm-license -b $out/bin -d $out/lib/${python.libPrefix}/site-packages -v $out/share/sip -p $out/plugins"; diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index c1812bfec22..e2b5496aef8 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "sip-4.10.2"; + name = "sip-4.10.5"; src = fetchurl { url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz"; - sha256 = "1vw810fa3g59r3cnfizxykq7dg84zcgs278cwrksk7rsgz8gdn9q"; + sha256 = "1hkn2n5hvfcfz0xprwyy5dzjzndgmvlf7abjsd868pv3hxdx1rs8"; }; configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include"; From fbf2ed6067f65abcfaa92b5cd725e42dabd3b5b7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 08:39:02 +0000 Subject: [PATCH 21/50] * Remove MD2 support from Heimdal because OpenSSL 1.0.0 no longer has it. See also http://repo.or.cz/w/heimdal.git/commitdiff/2a842e90d3417b667de0c5ecea7afa97496bdb4b svn path=/nixpkgs/branches/x-updates/; revision=22657 --- .../libraries/kerberos/heimdal.nix | 8 ++-- .../libraries/kerberos/no-md2.patch | 46 +++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/kerberos/no-md2.patch diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 6cdd1016690..27890bd01e8 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -1,16 +1,18 @@ -{stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl} : +{ stdenv, fetchurl, openldap, readline, db4, openssl, cyrus_sasl }: stdenv.mkDerivation rec { - name = "heimdal-1.3.2"; + name = "heimdal-1.3.3"; src = fetchurl { urls = [ "http://www.h5l.org/dist/src/${name}.tar.gz" "http://ftp.pdc.kth.se/pub/heimdal/src/${name}.tar.gz" ]; - sha256 = "0qwcq79nffsv9iyz4cf854l85i3x1cq79rxb34prpmjbfvs3ynwn"; + sha256 = "0c465by1g7niy3nkfs5mwrm6j6w2cvrf4988h3lpmj194lkjp3cc"; }; + patches = [ ./no-md2.patch ]; + ## ugly, X should be made an option configureFlags = "--with-openldap=${openldap} --without-x"; diff --git a/pkgs/development/libraries/kerberos/no-md2.patch b/pkgs/development/libraries/kerberos/no-md2.patch new file mode 100644 index 00000000000..c13671c988e --- /dev/null +++ b/pkgs/development/libraries/kerberos/no-md2.patch @@ -0,0 +1,46 @@ +http://old.nabble.com/-patch--fix-build-with-openssl-1.0-td28388913.html + +diff -Naur -x '*~' heimdal-1.3.2/include/crypto-headers.h heimdal-1.3.2-fix-build-openssl-1.0/include/crypto-headers.h +--- heimdal-1.3.2/include/crypto-headers.h 2010-03-22 05:11:24.000000000 +0100 ++++ heimdal-1.3.2-fix-build-openssl-1.0/include/crypto-headers.h 2010-04-28 14:54:53.000000000 +0200 +@@ -13,7 +13,9 @@ + #include + #include + #include ++#ifdef HAVE_OPENSSL_MD2_H + #include ++#endif + #include + #include + #include +diff -Naur -x '*~' heimdal-1.3.2/lib/hx509/crypto.c heimdal-1.3.2-fix-build-openssl-1.0/lib/hx509/crypto.c +--- heimdal-1.3.2/lib/hx509/crypto.c 2010-03-22 05:11:24.000000000 +0100 ++++ heimdal-1.3.2-fix-build-openssl-1.0/lib/hx509/crypto.c 2010-04-28 15:12:20.000000000 +0200 +@@ -1354,6 +1354,7 @@ + NULL + }; + ++#ifdef HAVE_OPENSSL_MD2_H + static const struct signature_alg md2_alg = { + "rsa-md2", + &asn1_oid_id_rsa_digest_md2, +@@ -1366,6 +1367,7 @@ + evp_md_verify_signature, + NULL + }; ++#endif + + /* + * Order matter in this structure, "best" first for each "key +@@ -1387,7 +1389,9 @@ + &sha256_alg, + &sha1_alg, + &md5_alg, ++#ifdef HAVE_OPENSSL_MD2_H + &md2_alg, ++#endif + NULL + }; + + + From 030981c1e71f21987204804888df81d719d55817 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 08:44:32 +0000 Subject: [PATCH 22/50] * nbd requires a static glib. Since it's the only package that does so, don't build the default glib statically but pass a custom glib to nbd. svn path=/nixpkgs/branches/x-updates/; revision=22658 --- pkgs/top-level/all-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9754b2b985a..dee8abbda73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1231,7 +1231,10 @@ let }; nbd = import ../tools/networking/nbd { - inherit fetchurl stdenv pkgconfig glib; + inherit fetchurl stdenv pkgconfig; + glib = gtkLibs.glib.override { + stdenv = makeStaticBinaries stdenv; + }; }; nc6 = composedArgsAndFun (import ../tools/networking/nc6/1.0.nix) { @@ -4287,7 +4290,7 @@ let gtkLibs220 = rec { - glib = import ../development/libraries/glib/2.24.x.nix { + glib = makeOverridable (import ../development/libraries/glib/2.24.x.nix) { inherit fetchurl stdenv pkgconfig gettext perl zlib; libiconv = if (stdenv.system == "i686-freebsd") then libiconv else null; }; From 0d225fb86ab3fc65b22de0475b7392c4ea7c3b1c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 08:59:05 +0000 Subject: [PATCH 23/50] * Support *.pc.in files that are not in the top directory of the package. svn path=/nixpkgs/branches/x-updates/; revision=22659 --- pkgs/servers/x11/xorg/default.nix | 8 ++++---- .../x11/xorg/generate-expr-from-tarballs.pl | 15 +++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index ad4796c16d7..ff9935da7d8 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1534,8 +1534,8 @@ let url = mirror://xorg/individual/driver/xf86-video-intel-2.12.0.tar.bz2; sha256 = "1pzzzpw0i55m6s48ac8c3a0453rskqrdb4v6s9dq5bvj3ywpysz1"; }; - buildInputs = [pkgconfig dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; - })) // {inherit dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; + buildInputs = [pkgconfig dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ]; + })) // {inherit dri2proto fontsproto glproto libdrm libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXvMC ;}; xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) { name = "xf86-video-mach64-6.8.2"; @@ -1974,8 +1974,8 @@ let url = mirror://xorg/individual/app/xlsclients-1.1.0.tar.bz2; sha256 = "037sph4zyar6061445xmf1bqrmm00k6qr9lpypjnrx4ragsm2nzr"; }; - buildInputs = [pkgconfig libxcb ]; - })) // {inherit libxcb ;}; + buildInputs = [pkgconfig libxcb xcbutil ]; + })) // {inherit libxcb xcbutil ;}; xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) { name = "xmessage-1.0.3"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index ff6d3815bb5..01d25923842 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -46,8 +46,7 @@ while (<>) { die unless defined $1; my $pkg = $1; $pkg =~ s/-//g; - #next unless $pkg eq "printproto"; - #print "$pkg\n"; + #next unless $pkg eq "xcbutil"; $tarball =~ /\/([^\/]*)\.tar\.bz2$/; my $pkgName = $1; @@ -77,25 +76,25 @@ while (<>) { my $pkgDir = `echo $tmpDir/*`; chomp $pkgDir; - my $provides = `cd $pkgDir && ls *.pc.in`; + my $provides = `find $pkgDir -name "*.pc.in"`; my @provides2 = split '\n', $provides; my @requires = (); - print "PROVIDES @provides2\n\n"; foreach my $pcFile (@provides2) { my $pc = $pcFile; + $pc =~ s/.*\///; $pc =~ s/.pc.in//; - die "collission with $pcMap{$pc}" if defined $pcMap{$pc}; + print "PROVIDES $pc\n"; + die "collision with $pcMap{$pc}" if defined $pcMap{$pc}; $pcMap{$pc} = $pkg; - print "$pkgDir/$pcFile\n"; - open FOO, "<$pkgDir/$pcFile" or die; + open FOO, "<$pcFile" or die; while () { if (/Requires:(.*)/) { my @reqs = split ' ', $1; foreach my $req (@reqs) { next unless $req =~ /^[a-z]+$/; - print "REQUIRE (from $pcFile): $req\n"; + print "REQUIRE (from $pc): $req\n"; push @requires, $req; } } From 5ebeb68c72d3012577b49d5962b4838915998b23 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 10:18:06 +0000 Subject: [PATCH 24/50] * Update the imake patch. svn path=/nixpkgs/branches/x-updates/; revision=22660 --- pkgs/servers/x11/xorg/imake.patch | 125 +++++++++--------------------- 1 file changed, 37 insertions(+), 88 deletions(-) diff --git a/pkgs/servers/x11/xorg/imake.patch b/pkgs/servers/x11/xorg/imake.patch index 56ab6334075..0426e448215 100644 --- a/pkgs/servers/x11/xorg/imake.patch +++ b/pkgs/servers/x11/xorg/imake.patch @@ -1,88 +1,37 @@ -diff -rc imake-orig/imake.c imake-X11R7.0-1.0.1/imake.c -*** imake-orig/imake.c 2005-11-08 07:33:24.000000000 +0100 ---- imake-X11R7.0-1.0.1/imake.c 2006-01-11 01:12:57.000000000 +0100 -*************** -*** 1056,1061 **** ---- 1056,1062 ---- - static void - get_distrib(FILE *inFile) - { -+ #if 0 - struct stat sb; - - static char* suse = "/etc/SuSE-release"; -*************** -*** 1101,1106 **** ---- 1102,1108 ---- - * at the content of /etc/debian_version */ - return; - } -+ #endif - /* what's the definitive way to tell what any particular distribution is? */ - - fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown"); -*************** -*** 1349,1402 **** - static boolean - get_gcc(char *cmd) - { -! struct stat sb; -! static char* gcc_path[] = { -! # if defined(linux) || \ -! defined(__NetBSD__) || \ -! defined(__OpenBSD__) || \ -! defined(__FreeBSD__) || \ -! defined(__DragonFly__) || \ -! defined(__APPLE__) || \ -! defined(__CYGWIN__) || \ -! defined(__MINGW32__) || \ -! defined(__GNU__) || \ -! defined(__GLIBC__) -! "/usr/bin/cc", /* for Linux PostIncDir */ -! # endif -! "/usr/local/bin/gcc", -! "/opt/gnu/bin/gcc", -! "/usr/pkg/bin/gcc" -! }; -! -! #ifdef CROSSCOMPILE -! static char* cross_cc_name[] = { -! "cc", -! "gcc" -! }; -! -! if (CrossCompiling) { -! int i; -! for (i = 0; i < sizeof (cross_cc_name) / sizeof cross_cc_name[0]; i++){ -! strcpy (cmd, CrossCompileDir); -! strcat (cmd, "/"); -! strcat (cmd, cross_cc_name[i]); -! if (lstat (cmd, &sb) == 0) { -! return TRUE; -! break; -! } -! } -! } else -! #endif -! { -! int i; -! for (i = 0; i < sizeof (gcc_path) / sizeof gcc_path[0]; i++) { -! if (lstat (gcc_path[i], &sb) == 0) { -! strcpy (cmd, gcc_path[i]); -! return TRUE; -! } -! } -! } -! return FALSE; - } - - #if defined CROSSCOMPILE || !defined __UNIXOS2__ ---- 1351,1358 ---- - static boolean - get_gcc(char *cmd) - { -! strcpy (cmd, "gcc"); -! return TRUE; - } - - #if defined CROSSCOMPILE || !defined __UNIXOS2__ +diff -ru -x '*~' imake-1.0.3-orig/imake.c imake-1.0.3/imake.c +--- imake-1.0.3-orig/imake.c 2009-10-16 23:45:43.000000000 +0200 ++++ imake-1.0.3/imake.c 2010-07-19 12:17:12.000000000 +0200 +@@ -1035,6 +1035,7 @@ + static void + get_distrib(FILE *inFile) + { ++#if 0 + struct stat sb; + + static char* suse = "/etc/SuSE-release"; +@@ -1080,6 +1081,7 @@ + * at the content of /etc/debian_version */ + return; + } ++#endif + /* what's the definitive way to tell what any particular distribution is? */ + + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown"); +@@ -1328,6 +1330,7 @@ + static boolean + get_gcc(char *cmd) + { ++#if 0 + struct stat sb; + static char* gcc_path[] = { + #if defined(linux) || \ +@@ -1376,6 +1379,9 @@ + } + } + return FALSE; ++#endif ++ strcpy (cmd, "gcc"); ++ return TRUE; + } + + #if defined CROSSCOMPILE || !defined __UNIXOS2__ From 7d963c8bb3a4f6c18c460b29fc9945ead350d386 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 10:27:46 +0000 Subject: [PATCH 25/50] * By default, OpenSSL on 64-bit platforms now installs libraries in $out/lib64, which is not what we want. svn path=/nixpkgs/branches/x-updates/; revision=22661 --- pkgs/development/libraries/openssl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 13204f59992..cffe167f503 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureScript = "./config"; - configureFlags = "shared"; + configureFlags = "shared --libdir=lib"; crossAttrs = { configurePhase = '' From b080c1172053c74ea38b1095efd7504d29382ba0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 10:32:31 +0000 Subject: [PATCH 26/50] * eggdbus now needs zlib because it uses glib's Requires.private. Maybe zlib should be a propagatedBuildInput in glib, not sure. svn path=/nixpkgs/branches/x-updates/; revision=22662 --- pkgs/development/tools/misc/eggdbus/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 97031a533fa..bbc0988aa86 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, zlib }: stdenv.mkDerivation rec { name = "eggdbus-0.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; - buildInputs = [ pkgconfig glib dbus.libs dbus_glib ]; + buildInputs = [ pkgconfig glib dbus.libs dbus_glib zlib ]; meta = { homepage = http://hal.freedesktop.org/releases/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dee8abbda73..2b7d0622ad9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3235,7 +3235,7 @@ let }; eggdbus = import ../development/tools/misc/eggdbus { - inherit stdenv fetchurl pkgconfig dbus dbus_glib glib; + inherit stdenv fetchurl pkgconfig dbus dbus_glib glib zlib; }; elfutils = import ../development/tools/misc/elfutils { From b8928b09fd4a2ceb267163c95e59d7f097352c3f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 11:43:45 +0000 Subject: [PATCH 27/50] * Okay, make zlib a propagated build input of glib. svn path=/nixpkgs/branches/x-updates/; revision=22666 --- pkgs/development/libraries/glib/2.24.x.nix | 4 +++- pkgs/development/tools/misc/eggdbus/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/glib/2.24.x.nix b/pkgs/development/libraries/glib/2.24.x.nix index bc17f4b906c..6fdb18e9b4d 100644 --- a/pkgs/development/libraries/glib/2.24.x.nix +++ b/pkgs/development/libraries/glib/2.24.x.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04"; }; - buildInputs = [ pkgconfig gettext perl libiconv zlib ]; + buildInputs = [ pkgconfig gettext perl libiconv ]; + + propagatedBuildInputs = [ zlib ]; meta = { description = "GLib, a C library of programming buildings blocks"; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index bbc0988aa86..97031a533fa 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, zlib }: +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib }: stdenv.mkDerivation rec { name = "eggdbus-0.6"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4"; }; - buildInputs = [ pkgconfig glib dbus.libs dbus_glib zlib ]; + buildInputs = [ pkgconfig glib dbus.libs dbus_glib ]; meta = { homepage = http://hal.freedesktop.org/releases/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b7d0622ad9..dee8abbda73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3235,7 +3235,7 @@ let }; eggdbus = import ../development/tools/misc/eggdbus { - inherit stdenv fetchurl pkgconfig dbus dbus_glib glib zlib; + inherit stdenv fetchurl pkgconfig dbus dbus_glib glib; }; elfutils = import ../development/tools/misc/elfutils { From 9909fdbbd640c8d7a6beaf41ffd59adeb145ee1b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 22:24:26 +0000 Subject: [PATCH 28/50] * Fix evaluation problems. svn path=/nixpkgs/branches/x-updates/; revision=22668 --- pkgs/development/libraries/libpng/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 13 +++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 5448dc136fa..bfd0a6b98b1 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ zlib ]; + + passthru = { inherit zlib; }; meta = { description = "The official reference implementation for the PNG file format"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dee8abbda73..887f1665d6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3004,7 +3004,7 @@ let xulrunnerWrapper = {application, launcher}: import ../development/interpreters/xulrunner/wrapper { inherit stdenv application launcher; - xulrunner = xulrunner35; + xulrunner = firefox36Pkgs.xulrunner; }; @@ -7964,8 +7964,7 @@ let inherit (xlibs) libXinerama; }; - firefox = firefox36; - + firefox = firefox36Pkgs.firefox; firefoxWrapper = firefox36Wrapper; firefox35Pkgs = import ../applications/networking/browsers/firefox/3.5.nix { @@ -7976,9 +7975,7 @@ let inherit (gnome) libIDL; }; - firefox35 = firefox35Pkgs.firefox; - xulrunner35 = firefox35Pkgs.xulrunner; - firefox35Wrapper = wrapFirefox firefox35 "firefox" ""; + firefox35Wrapper = wrapFirefox firefox35Pkgs.firefox "firefox" ""; firefox36Pkgs = import ../applications/networking/browsers/firefox/3.6.nix { inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo @@ -7988,7 +7985,7 @@ let inherit (gnome) libIDL; }; - firefox36Wrapper = lowPrio (wrapFirefox firefox36Pkgs.firefox "firefox" ""); + firefox36Wrapper = wrapFirefox firefox36Pkgs.firefox "firefox" ""; flac = import ../applications/audio/flac { inherit fetchurl stdenv libogg; @@ -8147,7 +8144,7 @@ let gecko_mediaplayer = import ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer { inherit fetchurl stdenv pkgconfig dbus dbus_glib x11 gnome_mplayer MPlayer glib; inherit (gnome) GConf; - browser = firefox35; + browser = firefox; }; geeqie = import ../applications/graphics/geeqie { From cceb5bcf80508cf57874ba9cf3fc9d025c3d7c01 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 23:24:16 +0000 Subject: [PATCH 29/50] * Work around (temporarily?) broken URL. svn path=/nixpkgs/branches/x-updates/; revision=22669 --- pkgs/development/libraries/libtiff/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 386abb6fbc2..d170c2fd231 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation { name = "libtiff-3.9.4"; src = fetchurl { - url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.4.tar.gz; + urls = + [ ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.4.tar.gz + http://download.osgeo.org/libtiff/tiff-3.9.4.tar.gz + ]; sha256 = "19hxd773yxcs4lxlc3zfdkz5aiv705vj2jvy5srpqkxpbw3nvdv7"; }; From 488f36ef19b11be4c52d59eb713d64e6ce1a2c12 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 23:24:37 +0000 Subject: [PATCH 30/50] * Apply a patch to make kdebindings build with the current sip. svn path=/nixpkgs/branches/x-updates/; revision=22670 --- pkgs/desktops/kde-4.4/bindings/builder.sh | 11 ----------- pkgs/desktops/kde-4.4/bindings/default.nix | 9 ++++++++- 2 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 pkgs/desktops/kde-4.4/bindings/builder.sh diff --git a/pkgs/desktops/kde-4.4/bindings/builder.sh b/pkgs/desktops/kde-4.4/bindings/builder.sh deleted file mode 100644 index e3f1df28b77..00000000000 --- a/pkgs/desktops/kde-4.4/bindings/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -tar xfvj $src -cd kdebindings-*/python/pykde4 -python configure.py -d $out/lib/python2.5/site-packages -v $out/share/sip -for i in `find . -name Makefile` -do - sed -i -e "s/-O2/-O0/" $i -done -make -make install diff --git a/pkgs/desktops/kde-4.4/bindings/default.nix b/pkgs/desktops/kde-4.4/bindings/default.nix index d08b8de6ec6..0c3dfd8cf80 100644 --- a/pkgs/desktops/kde-4.4/bindings/default.nix +++ b/pkgs/desktops/kde-4.4/bindings/default.nix @@ -7,11 +7,18 @@ stdenv.mkDerivation { name = "kdebindings-4.4.5"; + src = fetchurl { url = mirror://kde/stable/4.4.5/src/kdebindings-4.4.5.tar.bz2; sha256 = "0l8lk8vl68jc82lai4ljlm9ph53q4fn0ki0jq45lizdmqjgvahy4"; }; - #builder = ./builder.sh; + + patches = + [ (fetchurl { + url = "http://bugs.gentoo.org/attachment.cgi?id=238975"; + sha256 = "0vng8j8fhbq5ys8hy0bcvi6x2bym9j65dh61m2c1dr3z7rsx2bqb"; + }) + ]; # Disable smoke because I don't need it and gives us an error cmakeFlags = [ "-DENABLE_SMOKE=OFF" ]; From cb11b171d1a481b8626d124f53768f78d38eb9f9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Jul 2010 07:58:36 +0000 Subject: [PATCH 31/50] svn path=/nixpkgs/branches/x-updates/; revision=22671 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.5.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 ff9935da7d8..dfd615f8cc1 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -598,11 +598,11 @@ let })) // {inherit scrnsaverproto libX11 libXext xextproto ;}; libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) { - name = "libXau-1.0.5"; + name = "libXau-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/libXau-1.0.5.tar.bz2; - sha256 = "1vh8h4fhf6i59qwqqd4i2ki2qv0hajpx3cp1ri2rryi9iplb60x5"; + url = mirror://xorg/individual/lib/libXau-1.0.6.tar.bz2; + sha256 = "1z3h07wj2kg2hnzj4gd9pc3rkj4n0mfw6f9skg9w1hfwzrgl317f"; }; buildInputs = [pkgconfig xproto ]; })) // {inherit xproto ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.5.list b/pkgs/servers/x11/xorg/tarballs-7.5.list index d702fdc69c5..24313371b35 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.5.list +++ b/pkgs/servers/x11/xorg/tarballs-7.5.list @@ -57,7 +57,7 @@ mirror://xorg/individual/lib/libpciaccess-0.11.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/libSM-1.1.1.tar.bz2 mirror://xorg/X11R7.5/src/everything/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.3.4.tar.bz2 -mirror://xorg/X11R7.5/src/everything/libXau-1.0.5.tar.bz2 +mirror://xorg/individual/lib/libXau-1.0.6.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXaw-1.0.7.tar.bz2 mirror://xorg/individual/lib/libXcomposite-0.4.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/libXcursor-1.1.10.tar.bz2 From 0f53a3fca873cfb292c33ec60560a2f0a4b396f9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Jul 2010 12:53:07 +0000 Subject: [PATCH 32/50] * Ignore missing directories in the element. This allows the NixOS system bus configuration to include directories such as /nix/var/nix/profiles/default/etc/dbus-1/system.d/ which may not exist. svn path=/nixpkgs/branches/x-updates/; revision=22672 --- pkgs/development/libraries/dbus/default.nix | 14 ++++++----- .../dbus/ignore-missing-includedirs.patch | 23 +++++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/dbus/ignore-missing-includedirs.patch diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 24c6f409a10..8f8766fb6cf 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -7,6 +7,8 @@ let url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz"; sha256 = "0j2wb79kndq4b1qqr59n1g6s0lm7yp6r9ny3skimadkh9a7p8b7i"; }; + + patches = [ ./ignore-missing-includedirs.patch ]; configureFlags = "--localstatedir=/var --sysconfdir=/etc --with-session-socket-dir=/tmp"; @@ -17,9 +19,9 @@ in rec { buildInputs = [ pkgconfig expat ]; - inherit src configureFlags; + inherit src patches configureFlags; - patchPhase = + preConfigure = '' sed -i '/mkinstalldirs.*localstatedir/d' bus/Makefile.in sed -i '/SUBDIRS/s/ tools//' Makefile.in @@ -31,22 +33,22 @@ in rec { tools = stdenv.mkDerivation { name = "dbus-tools-" + version; - inherit src; + inherit src patches; configureFlags = "${configureFlags} --with-dbus-daemondir=${daemon}/bin"; buildInputs = [ pkgconfig expat libs ] ++ stdenv.lib.optionals useX11 [ libX11 libICE libSM ]; - postConfigure = "cd tools"; - NIX_LDFLAGS = "-ldbus-1"; - patchPhase = + preConfigure = '' sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:' ''; + + postConfigure = "cd tools"; }; # I'm too lazy to separate daemon and libs now. diff --git a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch new file mode 100644 index 00000000000..2781f4ae3de --- /dev/null +++ b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch @@ -0,0 +1,23 @@ +diff -ru -x '*~' dbus-1.2.24-orig/bus/config-parser.c dbus-1.2.24/bus/config-parser.c +--- dbus-1.2.24-orig/bus/config-parser.c 2010-03-23 20:01:27.000000000 +0100 ++++ dbus-1.2.24/bus/config-parser.c 2010-07-20 14:17:20.000000000 +0200 +@@ -2159,12 +2159,16 @@ + + retval = FALSE; + +- dir = _dbus_directory_open (dirname, error); ++ dbus_error_init (&tmp_error); ++ ++ dir = _dbus_directory_open (dirname, &tmp_error); + + if (dir == NULL) +- goto failed; ++ { ++ retval = TRUE; ++ goto failed; ++ } + +- dbus_error_init (&tmp_error); + while (_dbus_directory_get_next_file (dir, &filename, &tmp_error)) + { + DBusString full_path; From 37f66128751b376d2c844a7474dd33334e2ee881 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Jul 2010 19:22:02 +0000 Subject: [PATCH 33/50] * Disable GRUB 2's `make check' by default, because it requires QEMU. It's not so desirable to have GRUB 2 depend on X11, Mesa, SDL, PulseAudio, ... (I became very confused when changing Mesa triggered a rebuild of GRUB.) svn path=/nixpkgs/branches/x-updates/; revision=22680 --- pkgs/tools/misc/grub/1.9x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/grub/1.9x.nix b/pkgs/tools/misc/grub/1.9x.nix index df7d3408b61..25d56c28511 100644 --- a/pkgs/tools/misc/grub/1.9x.nix +++ b/pkgs/tools/misc/grub/1.9x.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" ''; - doCheck = true; + doCheck = false; meta = { description = "GNU GRUB, the Grand Unified Boot Loader (2.x alpha)"; From 78a5abdf8565773fa3b736dba7731046f3b5e2b0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 20 Jul 2010 19:24:21 +0000 Subject: [PATCH 34/50] * Updated the X.org server to 1.8.2. Note that it no longer depends on HAL but instead uses udev to autoconfigure input devices. We'll have to update the NixOS X server module accordingly, I guess. See https://fedoraproject.org/wiki/Input_device_configuration. * Updated Mesa to 7.8.2. svn path=/nixpkgs/branches/x-updates/; revision=22681 --- pkgs/development/libraries/mesa/default.nix | 11 ++++++----- pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 2 +- pkgs/servers/x11/xorg/overrides.nix | 8 +++++--- pkgs/servers/x11/xorg/tarballs-7.5.list | 2 +- pkgs/tools/graphics/glxinfo/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 22 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 23c12825f8e..d878135923d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -5,15 +5,16 @@ if ! stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms then else stdenv.mkDerivation { - name = "mesa-7.6.1"; + name = "mesa-7.8.2"; src = fetchurl { - url = ftp://ftp.freedesktop.org/pub/mesa/7.6.1/MesaLib-7.6.1.tar.bz2; - md5 = "7db4617e9e10ad3aca1b64339fd71b7d"; + url = ftp://ftp.freedesktop.org/pub/mesa/7.8.2/MesaLib-7.8.2.tar.bz2; + md5 = "6be2d343a0089bfd395ce02aaf8adb57"; }; - configureFlags = "--disable-gallium" - + (if stdenv.isDarwin then " --disable-egl" else ""); + configureFlags = + "--disable-gallium" + + (if stdenv.isDarwin then " --disable-egl" else ""); buildInputs = [ pkgconfig expat x11 libdrm xlibs.glproto diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dfd615f8cc1..55c2dd88ed2 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2018,14 +2018,14 @@ let })) // {inherit ;}; xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) { - name = "xorg-server-1.7.7"; + name = "xorg-server-1.8.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.7.7.tar.bz2; - sha256 = "1zr63701gii6aarxj9016gdymhiv3ycfdnixxbdjm1dqzqmx7i2l"; + url = mirror://xorg/individual/xserver/xorg-server-1.8.2.tar.bz2; + sha256 = "1qmcmrv26p8645nwdm2q558mpvi75fpn9knkacanzysw5497w5aj"; }; - buildInputs = [pkgconfig bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ]; - })) // {inherit bigreqsproto damageproto dbus fixesproto fontsproto hal inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;}; + buildInputs = [pkgconfig bigreqsproto damageproto dbus fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ]; + })) // {inherit bigreqsproto damageproto dbus fixesproto fontsproto inputproto kbproto libdrm openssl libpciaccess perl pixman randrproto renderproto libX11 libXau libXaw xcmiscproto libXdmcp xextproto libXfixes libXfont libxkbfile libXmu libXpm xproto libXrender libXres libXt xtrans libXv ;}; xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) { name = "xorg-sgml-doctools-1.3"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 01d25923842..2e4ff56294c 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -21,7 +21,7 @@ my %pcMap; my %extraAttrs; -my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mesa", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "hal", "openssl", "gperf", "m4"); +my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mesa", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4"); $pcMap{$_} = $_ foreach @missingPCs; $pcMap{"freetype2"} = "freetype"; $pcMap{"libpng12"} = "libpng"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1582fc4fdcd..87d4924a363 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -135,10 +135,12 @@ in xorgserver = attrs: attrs // { patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch]; buildInputs = attrs.buildInputs ++ - [ args.zlib xorg.xf86bigfontproto xorg.glproto args.mesa xorg.xf86driproto + [ args.zlib args.udev args.mesa + xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto - xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto xorg.dmxproto - xorg.libdmx xorg.xf86vidmodeproto xorg.libXext + xorg.xineramaproto xorg.dri2proto xorg.xf86dgaproto + xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto + xorg.recordproto xorg.libXext ]; propagatedBuildInputs = [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.5.list b/pkgs/servers/x11/xorg/tarballs-7.5.list index 24313371b35..8c8b0f38f5b 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.5.list +++ b/pkgs/servers/x11/xorg/tarballs-7.5.list @@ -179,7 +179,7 @@ mirror://xorg/individual/app/xlsatoms-1.1.0.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/xmodmap-1.0.4.tar.bz2 mirror://xorg/X11R7.5/src/everything/xorg-docs-1.5.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.7.7.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.8.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/xorg-sgml-doctools-1.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xpr-1.0.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xprop-1.1.0.tar.bz2 diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 8a055d274c9..d1978134a71 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, x11, mesa}: stdenv.mkDerivation { - name = "glxinfo-7.4.1"; + name = "glxinfo-7.8.2"; src = fetchurl { - url = mirror://sourceforge/mesa3d/MesaDemos-7.4.1.tar.bz2; - md5 = "1e169fb6abc2b45613f1c98a82dfe690"; + url = ftp://ftp.freedesktop.org/pub/mesa/7.8.2/MesaDemos-7.8.2.tar.bz2; + md5 = "757d9e2e06f48b1a52848be9b0307ced"; }; buildInputs = [x11 mesa]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 887f1665d6c..2a547f870d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6128,7 +6128,7 @@ let inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig libxslt expat libdrm libpng zlib perl mesa xkeyboard_config dbus hal libuuid openssl gperf m4 - automake autoconf libtool xmlto asciidoc; + automake autoconf libtool xmlto asciidoc udev; # !!! pythonBase is use instead of python because this cause an infinite # !!! recursion when the flag python.full is set to true. Packages From df7091a4a1193d9726fb99dd719097e88fa6ae77 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Jul 2010 11:29:26 +0000 Subject: [PATCH 35/50] * libpciaccess 0.12.0. svn path=/nixpkgs/branches/x-updates/; revision=22684 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.5.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 55c2dd88ed2..13b48256e9f 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -868,11 +868,11 @@ let })) // {inherit xproto zlib ;}; libpciaccess = (stdenv.mkDerivation ((if overrides ? libpciaccess then overrides.libpciaccess else x: x) { - name = "libpciaccess-0.11.0"; + name = "libpciaccess-0.12.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.11.0.tar.bz2; - sha256 = "1avx3kn44lk3xs49q8bqh8hqi08x0inab2zxlrk3rj2nnq9bwf3f"; + url = mirror://xorg/individual/lib/libpciaccess-0.12.0.tar.bz2; + sha256 = "0msnx3mcbqgghjscq3z1nh894k71k3bx659iaqlhgaqa3h7c1czn"; }; buildInputs = [pkgconfig zlib ]; })) // {inherit zlib ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.5.list b/pkgs/servers/x11/xorg/tarballs-7.5.list index 8c8b0f38f5b..4daec9d31ee 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.5.list +++ b/pkgs/servers/x11/xorg/tarballs-7.5.list @@ -53,7 +53,7 @@ mirror://xorg/X11R7.5/src/everything/libdmx-1.1.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/libfontenc-1.0.5.tar.bz2 mirror://xorg/X11R7.5/src/everything/libFS-1.0.2.tar.bz2 mirror://xorg/X11R7.5/src/everything/libICE-1.0.6.tar.bz2 -mirror://xorg/individual/lib/libpciaccess-0.11.0.tar.bz2 +mirror://xorg/individual/lib/libpciaccess-0.12.0.tar.bz2 mirror://xorg/X11R7.5/src/everything/libSM-1.1.1.tar.bz2 mirror://xorg/X11R7.5/src/everything/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.3.4.tar.bz2 From 2f6c7cd3dd2ce0cd39d92f47048a489419be7686 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Jul 2010 12:01:57 +0000 Subject: [PATCH 36/50] * Latest pciutils and usbutils, along with the latest PCI and USB IDs. svn path=/nixpkgs/branches/x-updates/; revision=22687 --- pkgs/os-specific/linux/usbutils/default.nix | 12 ++++++------ pkgs/tools/system/pciutils/default.nix | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 4d692c97ad7..b3093b22a25 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,24 +1,24 @@ -{stdenv, fetchurl, pkgconfig, libusb}: +{ stdenv, fetchurl, pkgconfig, libusb }: let # Obtained from http://www.linux-usb.org/usb.ids.bz2. usbids = fetchurl { - url = http://nixos.org/tarballs/usb.ids.20090808.bz2; - sha256 = "1007p5cm3k6vdsfrkwy92yvscazycz71k8wx32jygr50qsv1advj"; + url = http://nixos.org/tarballs/usb.ids.20100720.bz2; + sha256 = "0krncssk0b10z6grw305824zma953l3g2rb7jkk25mb78pw5fd5d"; }; in stdenv.mkDerivation rec { - name = "usbutils-0.84"; + name = "usbutils-0.86"; src = fetchurl { url = "mirror://sourceforge/linux-usb/${name}.tar.gz"; - sha256 = "1aksgfsnxq43q3aas4cwhmy34ik3h2sg4iv2al9vz2v9aqnib83n"; + sha256 = "1x0jkiwrgdb8qwy21iwhxpc8k61apxqp1901h866d1ydsakbxcmk"; }; - buildInputs = [pkgconfig libusb]; + buildInputs = [ pkgconfig libusb ]; preBuild = "bunzip2 < ${usbids} > usb.ids"; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 0c933967113..563521429a8 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchurl, zlib}: +{ stdenv, fetchurl, zlib }: -stdenv.mkDerivation { - name = "pciutils-3.1.2"; +stdenv.mkDerivation rec { + name = "pciutils-3.1.7"; src = fetchurl { - url = mirror://kernel/software/utils/pciutils/pciutils-3.1.2.tar.bz2; - sha256 = "15wksvqcgdj0hvsp5irc1igiqid69rrzpc33qj9nlyssvyw40vpn"; + url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2"; + sha256 = "0i7mqf1fkmdqsawdk2badv6k3xrkryq0i2xknclvy6kcjsv27znq"; }; - buildInputs = [zlib]; + buildInputs = [ zlib ]; pciids = fetchurl { # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2. - url = http://nixos.org/tarballs/pci.ids.20090727.bz2; - sha256 = "0q7fs5ww92a6v5dc514ff4vy7v9hzpdqbd1agbafc2wk2zgi10mk"; + url = http://nixos.org/tarballs/pci.ids.20100714.bz2; + sha256 = "0vll4svr60l6217yna7bfhcjm3prxr2b62ynq4jaagdp1rilfbap"; }; # Override broken auto-detect logic. From ab0d010869eedcdee35935571528158e6e0118c9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Jul 2010 12:02:12 +0000 Subject: [PATCH 37/50] * Udev updated to 160. svn path=/nixpkgs/branches/x-updates/; revision=22688 --- pkgs/os-specific/linux/udev/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix index d6007c9f957..4dec9200ed5 100644 --- a/pkgs/os-specific/linux/udev/default.nix +++ b/pkgs/os-specific/linux/udev/default.nix @@ -1,27 +1,27 @@ -{stdenv, fetchurl, gperf, pkgconfig, glib, acl, - libusb, usbutils, pciutils, ...}: +{ stdenv, fetchurl, gperf, pkgconfig, glib, acl +, libusb, usbutils, pciutils }: assert stdenv ? glibc; stdenv.mkDerivation rec { - name = "udev-154"; + name = "udev-160"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2"; - sha256 = "1aw5vn96gasvkjh6nfivaf68l6ph33y63zf7gnp3mc7c7zfncm0c"; + sha256 = "0wx43bxiff8i80k7w3j2iszksdzw1hz6sanx8cjsiypgppi4fr12"; }; - buildInputs = [gperf pkgconfig glib acl libusb usbutils]; + buildInputs = [ gperf pkgconfig glib acl libusb usbutils ]; - configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids - --disable-introspection - --with-firmware-path=/root/test-firmware:/var/run/current-system/firmware"; + configureFlags = + '' + --with-pci-ids-path=${pciutils}/share/pci.ids + --disable-introspection + --with-firmware-path=/root/test-firmware:/var/run/current-system/firmware + ''; postInstall = '' - # Install some rules that really should be installed by default. - cp rules/packages/40-pilot-links.rules $out/libexec/rules.d/ - # The path to rule_generator.functions in write_cd_rules and # write_net_rules is broken. Also, don't store the mutable # persistant rules in /etc/udev/rules.d but in From f555da864d68528a6fc45a95c96028a8a3cd1b78 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Jul 2010 15:30:25 +0000 Subject: [PATCH 38/50] * dar: build with --disable-dar-static, apparently the zlib update broke it. Also upgrade to 2.3.10 and turn on ACL support. svn path=/nixpkgs/branches/x-updates/; revision=22690 --- pkgs/tools/archivers/dar/default.nix | 21 ++++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index e096313a4c1..49c56d075d3 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -1,18 +1,21 @@ -{stdenv, fetchurl, zlib, bzip2, openssl}: +{ stdenv, fetchurl, zlib, bzip2, openssl, attr }: stdenv.mkDerivation rec { - name = "dar-2.3.9"; + name = "dar-2.3.10"; + src = fetchurl { - url = "mirror://sourceforge/dar/dar-2.3.9.tar.gz"; - sha256 = "037ak6wckqyn52000m8bapgnf70rw776dl3s61i9bdq548slq6yc"; + url = "mirror://sourceforge/dar/${name}.tar.gz"; + sha256 = "04qzdcz97bzz414khfj82hn8s1i1ry7qxaikq8lj1069gvhc6qjn"; }; - buildInputs = [zlib bzip2 openssl]; + buildInputs = [ zlib bzip2 openssl attr ]; + + configureFlags = "--disable-dar-static"; meta = { - homepage = http://dar.linux.free.fr/; - description = "Disk ARchiver, allows backing up files into indexed archives"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + homepage = http://dar.linux.free.fr/; + description = "Disk ARchiver, allows backing up files into indexed archives"; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a547f870d5..9ac8ade3ed8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -606,7 +606,7 @@ let }; dar = import ../tools/archivers/dar { - inherit fetchurl stdenv zlib bzip2 openssl; + inherit fetchurl stdenv zlib bzip2 openssl attr; }; davfs2 = import ../tools/filesystems/davfs2 { From 0e6ea04477d7bd85c968df6eef4b27e4e0d98040 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Jul 2010 09:49:48 +0000 Subject: [PATCH 39/50] * Update Ruby to 1.8.7-p299 to fix a build problem caused by the upgrade to OpenSSL 1.0.0 (http://hydra.nixos.org/build/494496/nixlog/1/raw). svn path=/nixpkgs/branches/x-updates/; revision=22700 --- pkgs/development/interpreters/ruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 93845ae17c4..43d0915c1f0 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { - version = "1.8.7-p72"; + version = "1.8.7-p299"; name = "ruby-${version}"; src = fetchurl { url = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/${name}.tar.gz"; - sha256 = "e15ca005076f5d6f91fc856fdfbd071698a4cadac3c6e25855899dba1f6fc5ef"; + sha256 = "0ys2lpri2w3174axhi96vq17lrvk2ngj7f2m42a9008a7n79rj9j"; }; buildInputs = [ncurses readline] From 6faed26c430ab85c777e2cf5ef27994b9c2349cc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Jul 2010 10:31:39 +0000 Subject: [PATCH 40/50] * nmap: apply a patch to remove md2 support. svn path=/nixpkgs/branches/x-updates/; revision=22701 --- pkgs/tools/security/nmap/default.nix | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 4a5627072ca..46966835e14 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -3,7 +3,7 @@ , pycairo, pysqlite }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "nmap-5.21"; src = fetchurl { @@ -11,11 +11,20 @@ stdenv.mkDerivation (rec { sha256 = "1fmh05iamynmr8zic3bja6dr0pfiwp0hr2nc2wpiqm2pc7w29jwz"; }; - postInstall ='' - wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0 - ''; + patches = + [ (fetchurl { + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-analyzer/nmap/files/nmap-5.21-openssl-1.patch?revision=1.1"; + sha256 = "0q0kgwvg5b770xpp31a5a3lxh8d5ik6d5bv11nlh3syd78q6f08y"; + }) + ]; - buildInputs = [ - libpcap libX11 gtk pkgconfig openssl python pygtk makeWrapper pysqlite - ]; -}) + patchFlags = "-p0"; + + postInstall = + '' + wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0 + ''; + + buildInputs = + [ libpcap libX11 gtk pkgconfig openssl python pygtk makeWrapper pysqlite ]; +} From fc47f20db1df0d37b907245507de68dae3f61ec7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Jul 2010 10:41:34 +0000 Subject: [PATCH 41/50] * Try to build OpenOffice and Go-oo with Neon 0.29, since 0.26 doesn't work anymore. svn path=/nixpkgs/branches/x-updates/; revision=22702 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ac8ade3ed8..e18ae286c04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8553,7 +8553,7 @@ let inherit (gtkLibs) gtk; inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2; - neon = neon026; + neon = neon029; stdenv = stdenv2; }; @@ -8566,7 +8566,7 @@ let inherit (gtkLibs) gtk; inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome) GConf ORBit2; - neon = neon026; + neon = neon029; stdenv = stdenv2; inherit autoconf openldap postgresql; From ea14f111ddaf0082fe99d323799dd99eca4bb1a2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Jul 2010 12:59:12 +0000 Subject: [PATCH 42/50] * Chatzilla updated to 0.9.86. svn path=/nixpkgs/branches/x-updates/; revision=22706 --- .../networking/irc/chatzilla/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix index ea0cb9a4ad8..b981c105a0c 100644 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ b/pkgs/applications/networking/irc/chatzilla/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: -stdenv.mkDerivation { - name = "chatzilla-0.9.85"; +stdenv.mkDerivation rec { + name = "chatzilla-0.9.86"; src = fetchurl { # Obtained from http://chatzilla.rdmsoft.com/xulrunner/. - url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.85-xr.zip; - sha256 = "0jd7mq05715vad82sl4ycr7ga587k53dijxz371y3zwpf8479hqx"; + url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.86-xr.zip; + sha256 = "1z8767arx2ncch0pzkdzhisjgmd45qianahz3xr8isvahv2klj5x"; }; - buildInputs = [unzip]; + buildInputs = [ unzip ]; buildCommand = '' ensureDir $out From b33d41ef084dff09e4e79aaf583b9ae2ac2efc61 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Jul 2010 14:08:44 +0000 Subject: [PATCH 43/50] * clutter-gtk updated to 0.10.4 so that it builds against the current GTK+ (http://hydra.nixos.org/build/495170). svn path=/nixpkgs/branches/x-updates/; revision=22711 --- pkgs/development/libraries/clutter-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 4d4aa4e835c..d2b123fade3 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, clutter, gtk }: stdenv.mkDerivation rec { - name = "clutter-gtk-0.10.2"; + name = "clutter-gtk-0.10.4"; src = fetchurl { url = "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2"; - sha256 = "1jdhhqin4wi8gk6i1m701vrhm6lrvywq3q3yy88ph8yj8h6z4any"; + sha256 = "04mrq5ddj24zhh7dvyp9bl8510wq7qpmy3rl3wiqwl9c43gahd01"; }; buildInputs = [ pkgconfig clutter gtk ]; From c33bdf500a35e6266120fdcf3239a76ba5bee53a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Jul 2010 14:57:28 +0000 Subject: [PATCH 44/50] * bluez updated to 4.69. svn path=/nixpkgs/branches/x-updates/; revision=22721 --- pkgs/os-specific/linux/bluez/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index afa98a0683b..2868a70e8b6 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-4.66"; + name = "bluez-4.69"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.gz"; - sha256 = "19by1ay2lifczcn8b7wppm0fcnp33yzd1vzldrzz3cgh1nwcn8y2"; + sha256 = "1h4fp6l1sflc0l5vg90hzvgldlwv7rqc4cbn2z6axmxv969pmrhh"; }; buildInputs = [ pkgconfig dbus.libs glib libusb alsaLib ]; From 07afe31016aea5a7dbaa7fafd4b151cc1f880ee0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Jul 2010 15:05:20 +0000 Subject: [PATCH 45/50] * Doh, we already had OpenSSL 1.0.0. Use the updated Darwin patch. svn path=/nixpkgs/branches/x-updates/; revision=22722 --- pkgs/development/libraries/openssl/1.x.nix | 45 ------------------- .../libraries/openssl/darwin-arch-1.patch | 16 ------- .../libraries/openssl/darwin-arch.patch | 44 +++++++----------- .../development/libraries/openssl/default.nix | 6 +-- pkgs/top-level/all-packages.nix | 5 --- 5 files changed, 18 insertions(+), 98 deletions(-) delete mode 100644 pkgs/development/libraries/openssl/1.x.nix delete mode 100644 pkgs/development/libraries/openssl/darwin-arch-1.patch diff --git a/pkgs/development/libraries/openssl/1.x.nix b/pkgs/development/libraries/openssl/1.x.nix deleted file mode 100644 index eae32de30e4..00000000000 --- a/pkgs/development/libraries/openssl/1.x.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, perl }: - -let - opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] - (throw "openssl needs its platform name cross building" null) - stdenv.cross; -in - -stdenv.mkDerivation (rec { - name = "openssl-1.0.0"; - - src = fetchurl { - url = "http://www.openssl.org/source/${name}.tar.gz"; - sha1 = "3f800ea9fa3da1c0f576d689be7dca3d55a4cb62"; - }; - - buildNativeInputs = [ perl ]; - - configureScript = "./config"; - - configureFlags="--libdir=lib shared"; - - crossAttrs = { - preConfigure='' - export cross=$crossSystem- - ''; - configureFlags="--libdir=lib ${opensslCrossSystem} shared"; - buildPhase = '' - make CC=$crossConfig-gcc \ - AR="$crossConfig-ar r" \ - RANLIB=$crossConfig-ranlib - ''; - }; - - meta = { - homepage = http://www.openssl.org/; - description = "A cryptographic library that implements the SSL and TLS protocols"; - }; -} -// -(if stdenv.isDarwin then { - patches = ./darwin-arch.patch; -} -else { }) -) diff --git a/pkgs/development/libraries/openssl/darwin-arch-1.patch b/pkgs/development/libraries/openssl/darwin-arch-1.patch deleted file mode 100644 index ad8e86c6791..00000000000 --- a/pkgs/development/libraries/openssl/darwin-arch-1.patch +++ /dev/null @@ -1,16 +0,0 @@ -The patch is specific to nix: MacOS gcc supports -arch. ---- a/Configure -+++ b/Configure -@@ -549,9 +549,9 @@ my %table=( - "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", - "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", --"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -+"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - - ##### A/UX diff --git a/pkgs/development/libraries/openssl/darwin-arch.patch b/pkgs/development/libraries/openssl/darwin-arch.patch index f17a40395d6..ad8e86c6791 100644 --- a/pkgs/development/libraries/openssl/darwin-arch.patch +++ b/pkgs/development/libraries/openssl/darwin-arch.patch @@ -1,30 +1,16 @@ -Removed -arch flags for darwin as they are not supported by gcc-darwin. +The patch is specific to nix: MacOS gcc supports -arch. +--- a/Configure ++++ b/Configure +@@ -549,9 +549,9 @@ my %table=( + "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", + "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +-"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ++"darwin64-x86_64-cc","cc:-O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -diff -rc openssl-0.9.8n/Configure openssl-0.9.8n-new/Configure -*** openssl-0.9.8n/Configure Mon Nov 9 15:14:26 2009 ---- openssl-0.9.8n-new/Configure Thu Apr 29 10:16:15 2010 -*************** -*** 523,533 **** - - ##### MacOS X (a.k.a. Rhapsody or Darwin) setup - "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", -! "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - - ##### A/UX ---- 523,533 ---- - - ##### MacOS X (a.k.a. Rhapsody or Darwin) setup - "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", -! "darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common: -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "darwin64-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc64.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "debug-darwin-i386-cc","cc:-g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -! "darwin64-x86_64-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - - ##### A/UX + ##### A/UX diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index cffe167f503..c6d827dc0bf 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0qqgyzfb0alwx329z8bqybzamfl9j2maykykvq6zk3ibq0gvva8q"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; + patches = ./darwin-arch.patch; buildNativeInputs = [ perl ]; @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { configureFlags = "shared --libdir=lib"; crossAttrs = { - configurePhase = '' + preConfigure='' export cross=$crossSystem- - ./Configure --prefix=$out ${opensslCrossSystem} shared ''; + configureFlags="--libdir=lib ${opensslCrossSystem} shared"; buildPhase = '' make CC=$crossConfig-gcc \ AR="$crossConfig-ar r" \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a057ac1042..f7f0e974dd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5205,11 +5205,6 @@ let inherit stdenv perl; }; - openssl1 = makeOverridable (import ../development/libraries/openssl/1.x.nix) { - fetchurl = fetchurlBoot; - inherit stdenv perl; - }; - ortp = import ../development/libraries/ortp { inherit fetchurl stdenv; }; From 3587a2f78e35535b4ef6ff7b1083ec7dc3156343 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 23 Jul 2010 15:36:35 +0000 Subject: [PATCH 46/50] * Doh. svn path=/nixpkgs/branches/x-updates/; revision=22723 --- pkgs/development/libraries/openssl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c6d827dc0bf..f74eed27def 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0qqgyzfb0alwx329z8bqybzamfl9j2maykykvq6zk3ibq0gvva8q"; }; - patches = ./darwin-arch.patch; + patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; buildNativeInputs = [ perl ]; From 9b87ffa52200b534cd1488d15f130a9abed97f19 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 24 Jul 2010 08:50:30 +0000 Subject: [PATCH 47/50] * Make mutt build against OpenSSL 1.0.0. svn path=/nixpkgs/branches/x-updates/; revision=22724 --- .../networking/mailreaders/mutt/default.nix | 5 +++++ .../networking/mailreaders/mutt/openssl.patch | 15 +++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/mutt/openssl.patch diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 86e6873f4b4..fbc9a08bd68 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -14,16 +14,21 @@ assert saslSupport -> cyrus_sasl != null; stdenv.mkDerivation { name = "mutt-1.5.20"; + src = fetchurl { url = ftp://ftp.mutt.org/mutt/devel/mutt-1.5.20.tar.gz; sha256 = "15m7m419r82awx4mr4nam25m0kpg0bs9vw1z4a4mrzvlkl3zqycm"; }; + + patches = [ ./openssl.patch ]; + buildInputs = [ ncurses which perl (if headerCache then gdbm else null) (if sslSupport then openssl else null) (if saslSupport then cyrus_sasl else null) ]; + configureFlags = [ "--with-mailpath=" "--enable-smtp" # The next allows building mutt without having anything setgid diff --git a/pkgs/applications/networking/mailreaders/mutt/openssl.patch b/pkgs/applications/networking/mailreaders/mutt/openssl.patch new file mode 100644 index 00000000000..6476075d67d --- /dev/null +++ b/pkgs/applications/networking/mailreaders/mutt/openssl.patch @@ -0,0 +1,15 @@ +Fixes a compilation problem with OpenSSL 1.0.0. +From http://www.freebsd.org/cgi/query-pr.cgi?pr=146261 + +diff -ru -x '*~' mutt-1.5.20-orig/mutt_ssl.c mutt-1.5.20/mutt_ssl.c +--- mutt-1.5.20-orig/mutt_ssl.c 2009-06-10 07:08:29.000000000 +0200 ++++ mutt-1.5.20/mutt_ssl.c 2010-07-24 10:46:08.000000000 +0200 +@@ -652,7 +652,7 @@ + char *buf = NULL; + int bufsize; + /* needed to get the DNS subjectAltNames: */ +- STACK *subj_alt_names; ++ STACK_OF(GENERAL_NAME) *subj_alt_names; + int subj_alt_names_count; + GENERAL_NAME *subj_alt_name; + /* did we find a name matching hostname? */ From 4a6eb1183e4d7b7f8453ca9e9b6c7c168d1403c1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 25 Jul 2010 09:09:32 +0000 Subject: [PATCH 48/50] * On x86_64-darwin, "./config" misdetects the system as "darwin-i386-cc" (http://hydra.nixos.org/build/498076). So specify the system type explicitly. svn path=/nixpkgs/branches/x-updates/; revision=22726 --- pkgs/development/libraries/openssl/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index f74eed27def..6dd579b98be 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -17,8 +17,11 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; buildNativeInputs = [ perl ]; - - configureScript = "./config"; + + # On x86_64-darwin, "./config" misdetects the system as + # "darwin-i386-cc". So specify the system type explicitly. + configureScript = + if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config"; configureFlags = "shared --libdir=lib"; From e6ff6558d63e2d4365e9069ba492389126e7fb13 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 25 Jul 2010 09:14:12 +0000 Subject: [PATCH 49/50] * xrandr 1.3.3. svn path=/nixpkgs/branches/x-updates/; revision=22727 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.5.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 13b48256e9f..4332e35f905 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2068,11 +2068,11 @@ let })) // {inherit ;}; xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) { - name = "xrandr-1.3.2"; + name = "xrandr-1.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.5/src/everything/xrandr-1.3.2.tar.bz2; - sha256 = "0j92j67067l6nj1nhfwdik7c14cgxdzn9f0v2irlajd68i337m1l"; + url = mirror://xorg/individual/app/xrandr-1.3.3.tar.bz2; + sha256 = "0iiywk10vi56k7bpdlhn4wv0friz8vzz6dbfhy1xrnrvsgkg73wn"; }; buildInputs = [pkgconfig libX11 libXrandr libXrender ]; })) // {inherit libX11 libXrandr libXrender ;}; diff --git a/pkgs/servers/x11/xorg/tarballs-7.5.list b/pkgs/servers/x11/xorg/tarballs-7.5.list index 4daec9d31ee..37bc5d742e4 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.5.list +++ b/pkgs/servers/x11/xorg/tarballs-7.5.list @@ -184,7 +184,7 @@ mirror://xorg/X11R7.5/src/everything/xorg-sgml-doctools-1.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xpr-1.0.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xprop-1.1.0.tar.bz2 mirror://xorg/individual/proto/xproto-7.0.17.tar.bz2 -mirror://xorg/X11R7.5/src/everything/xrandr-1.3.2.tar.bz2 +mirror://xorg/individual/app/xrandr-1.3.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xrdb-1.0.6.tar.bz2 mirror://xorg/X11R7.5/src/everything/xrefresh-1.0.3.tar.bz2 mirror://xorg/X11R7.5/src/everything/xset-1.1.0.tar.bz2 From 3f287cfb1d3571e8149c47a0460d15282e47dc45 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 25 Jul 2010 12:15:59 +0000 Subject: [PATCH 50/50] * Ensure that the dell-bluetooth device does not stay in the "hard blocked" state. svn path=/nixpkgs/branches/x-updates/; revision=22730 --- .../linux/kernel/dell-rfkill.patch | 23 +++++++++++++++++++ pkgs/os-specific/linux/kernel/patches.nix | 5 ++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 29 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/dell-rfkill.patch diff --git a/pkgs/os-specific/linux/kernel/dell-rfkill.patch b/pkgs/os-specific/linux/kernel/dell-rfkill.patch new file mode 100644 index 00000000000..32f890c84f6 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/dell-rfkill.patch @@ -0,0 +1,23 @@ +Ensure that the dell-bluetooth device does not stay in the "hard +blocked" state. + +From https://patchwork.kernel.org/patch/37539/ + +diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c +index 74909c4..cf40c4e 100644 +--- a/drivers/platform/x86/dell-laptop.c ++++ b/drivers/platform/x86/dell-laptop.c +@@ -197,8 +197,11 @@ static void dell_rfkill_query(struct rfkill *rfkill, void *data) + dell_send_request(&buffer, 17, 11); + status = buffer.output[1]; + +- if (status & BIT(bit)) +- rfkill_set_hw_state(rfkill, !!(status & BIT(16))); ++ /* ++ * Don't change state unless the read-only HW rfkill switch is disabled. ++ */ ++ if (status & BIT(16)) ++ rfkill_set_hw_state(rfkill, !!(status & BIT(bit))); + } + + static const struct rfkill_ops dell_rfkill_ops = { diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 12370c98879..4019348375a 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -172,5 +172,10 @@ in }; features.noXsave = true; }; + + dell_rfkill = + { name = "dell-rfkill"; + patch = ./dell-rfkill.patch; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7f0e974dd5..3f13c7b9db9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6523,6 +6523,7 @@ let kernelPatches.aufs2_2_6_32 kernelPatches.cifs_timeout kernelPatches.no_xsave + kernelPatches.dell_rfkill ]; };